diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-03-22 11:19:19 -0400 |
| commit | 1eefbb2693f0f29f8f095af9f067240b85e735aa (patch) | |
| tree | 35dbaa90de4bb52162b176725aa6ac10d8de0e4f /nix | |
| parent | b1a01474ac4f5bae1f2689805105103742178c2b (diff) | |
| parent | 6212b8e5d3f08a3ff05111167f0b190cea800c7c (diff) | |
| download | patches-1eefbb2693f0f29f8f095af9f067240b85e735aa.tar patches-1eefbb2693f0f29f8f095af9f067240b85e735aa.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index 79cd080363..086b846ce1 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -287,10 +287,11 @@ main (int argc, char *argv[]) string subs = getEnv ("NIX_SUBSTITUTERS", "default"); if (subs == "default") - settings.substituters.push_back (settings.nixLibexecDir - + "/guix/substitute-binary"); - else - settings.substituters = tokenizeString<Strings> (subs, ":"); + { + string subst = + settings.nixLibexecDir + "/guix/substitute-binary"; + setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1); + } } if (geteuid () == 0 && settings.buildUsersGroup.empty ()) |