diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13T15·09+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-13T15·09+0200 |
| commit | fb2dd3210072a03526e881cd2547cf4c2df4ba52 (patch) | |
| tree | 3d44c43f4d05a3f038b7e25e070dd50aef69bfa9 /misc | |
| parent | 816d3e57248da2ce4976ae9f8334ee467bcd657e (diff) | |
SSL_CERT_FILE -> NIX_SSL_CERT_FILE
This prevents collisions with the "native" OpenSSL, in particular on OS X. Fixes #921.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | misc/launchd/org.nixos.nix-daemon.plist.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 20171d250207..7b2865c946d3 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -13,11 +13,11 @@ ONBUILD ENV \ ENV=/etc/profile \ PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ - SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt + NIX_SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt ENV \ ENV=/etc/profile \ PATH=/root/.nix-profile/bin:/root/.nix-profile/sbin:/bin:/sbin:/usr/bin:/usr/sbin \ GIT_SSL_CAINFO=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ - SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ + NIX_SSL_CERT_FILE=/root/.nix-profile/etc/ssl/certs/ca-bundle.crt \ NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/ diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in index 0dd665db635f..c5ef97ee9a3f 100644 --- a/misc/launchd/org.nixos.nix-daemon.plist.in +++ b/misc/launchd/org.nixos.nix-daemon.plist.in @@ -14,7 +14,7 @@ <string>/dev/null</string> <key>EnvironmentVariables</key> <dict> - <key>SSL_CERT_FILE</key> + <key>NIX_SSL_CERT_FILE</key> <string>/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt</string> </dict> </dict> |