* normaliseFState() now locks all output paths prior to building, thus
ensuring that simultaneous invocations of Nix don't clobber each other's builds. * Fixed a bug in `make install'.
This commit is contained in:
parent
9df93f30bd
commit
545145cd58
5 changed files with 151 additions and 30 deletions
|
|
@ -22,7 +22,7 @@ noinst_LIBRARIES = libnix.a libshared.a
|
|||
|
||||
libnix_a_SOURCES = util.cc hash.cc archive.cc md5.c \
|
||||
store.cc fstate.cc normalise.cc exec.cc \
|
||||
globals.cc db.cc references.cc
|
||||
globals.cc db.cc references.cc pathlocks.cc
|
||||
|
||||
libshared_a_SOURCES = shared.cc
|
||||
|
||||
|
|
@ -44,6 +44,7 @@ install-data-local:
|
|||
$(INSTALL) -d $(localstatedir)/nix
|
||||
$(INSTALL) -d $(localstatedir)/nix/db
|
||||
$(INSTALL) -d $(localstatedir)/nix/links
|
||||
rm -f $(prefix)/current
|
||||
ln -sf $(localstatedir)/nix/links/current $(prefix)/current
|
||||
$(INSTALL) -d $(localstatedir)/log/nix
|
||||
$(INSTALL) -d $(prefix)/store
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue