nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Clear $NIX_SUBSTITUTERS when passed '--no-substitutes'. 

* nix/nix-daemon/guix-daemon.cc (main): When --no-substitutes is used,
  clear NIX_SUBSTITUTERS.  Before that, and after
  89faa5c75c, '--no-substitutes' would
  lead to attempts to use 'download-using-manifests.pl', which in
  practice would gracelessly fail.
This commit is contained in:
Ludovic Courtès 2014-03-27 22:35:34 +01:00
parent ad0ab74eef
commit 968e84a6cf
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nix/nix-daemon/guix-daemon.cc
View File

@ -296,6 +296,13 @@ main (int argc, char *argv[])
setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1); setenv ("NIX_SUBSTITUTERS", subst.c_str (), 1);
} }
} }
else
/* Clear the substituter list to make sure nothing ever gets
substituted, regardless of the client's settings. */
setenv ("NIX_SUBSTITUTERS", "", 1);
/* Effect the $NIX_SUBSTITUTERS change. */
settings.update ();
if (geteuid () == 0 && settings.buildUsersGroup.empty ()) if (geteuid () == 0 && settings.buildUsersGroup.empty ())
fprintf (stderr, "warning: daemon is running as root, so " fprintf (stderr, "warning: daemon is running as root, so "