diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-11-20 01:14:12 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-11-20 01:14:12 +0100 |
| commit | 4f70db97a040b35f125484ce8885766ca5807dd4 (patch) | |
| tree | 30274f4a57e4a149127125fb6df626dd1d9f9cf0 /nix/nix-daemon/guix-daemon.cc | |
| parent | 2d546858b139e5fcf2cbdf9958a17fd98803ac4c (diff) | |
| parent | 9acfe275adf1bc27483ba58c6d86a84ba20aa08f (diff) | |
| download | patches-4f70db97a040b35f125484ce8885766ca5807dd4.tar patches-4f70db97a040b35f125484ce8885766ca5807dd4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'nix/nix-daemon/guix-daemon.cc')
| -rw-r--r-- | nix/nix-daemon/guix-daemon.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/nix/nix-daemon/guix-daemon.cc b/nix/nix-daemon/guix-daemon.cc index b71b100f6c..8fdab2d116 100644 --- a/nix/nix-daemon/guix-daemon.cc +++ b/nix/nix-daemon/guix-daemon.cc @@ -466,18 +466,6 @@ main (int argc, char *argv[]) { settings.processEnvironment (); - /* Hackily help 'local-store.cc' find our 'guix-authenticate' program, which - is known as 'OPENSSL_PATH' here. */ - std::string search_path; - search_path = settings.nixLibexecDir; - if (getenv ("PATH") != NULL) - { - search_path += ":"; - search_path += getenv ("PATH"); - } - - setenv ("PATH", search_path.c_str (), 1); - /* Use our substituter by default. */ settings.substituters.clear (); settings.set ("build-use-substitutes", "true"); |