wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 23:13:14 +02:00
Code Activity

move preBuildHook defaulting to globals.cc

Browse source
This commit is contained in:
Jude Taylor 2015-10-21 14:39:08 -07:00
parent 2dc8e19a17
commit 76f3ba42fd
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/libstore/globals.cc
View file

@ -77,6 +77,11 @@ void Settings::processEnvironment()
nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));
nixDaemonSocketFile = canonPath(nixStateDir + DEFAULT_SOCKET_PATH);
// should be set with the other config options, but depends on nixLibexecDir
#ifdef __APPLE__
preBuildHook = nixLibexecDir + "/nix/resolve-system-dependencies.pl";
#endif
}