ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 05:18:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: Really override the substituters setting.

Browse source 
Reported by Andreas Enge <andreas@enge.fr>:
<https://lists.gnu.org/archive/html/guix-devel/2014-03/msg00211.html>.

* nix/nix-daemon/guix-daemon.cc (main): Set the 'NIX_SUBSTITUTERS'
  env. var.  Leave 'settings.substituters' unchanged.
This commit is contained in:
Ludovic Courtès 2014-03-20 23:05:59 +01:00
parent 1fda6840a8
commit 89faa5c75c
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nix/nix-daemon/guix-daemon.cc
View file

@ -287,10 +287,11 @@ main (int argc, char *argv[])
string subs = getEnv ("NIX_SUBSTITUTERS", "default"); string subs = getEnv ("NIX_SUBSTITUTERS", "default");
if (subs == "default") if (subs == "default")
settings.substituters.push_back (settings.nixLibexecDir {
+ "/guix/substitute-binary"); string subst =
else settings.nixLibexecDir + "/guix/substitute-binary";
settings.substituters = tokenizeString<Strings> (subs, ":"); setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1);
}
} }
if (geteuid () == 0 && settings.buildUsersGroup.empty ()) if (geteuid () == 0 && settings.buildUsersGroup.empty ())