summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Spinale <nick@nickspinale.com>2019-09-12 19:16:58 +0000
committerNick Spinale <nick@nickspinale.com>2019-09-12 20:14:47 +0000
commite7ede726ba80291acfbc66808d0d06fde3aab42d (patch)
tree728e9b2341ef6077553114b837deb81c20f428ec
parent37e333af9a18814537b872745d9b1c580c1b1a9d (diff)
downloadnixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar.gz
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar.bz2
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar.lz
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar.xz
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.tar.zst
nixpkgs-e7ede726ba80291acfbc66808d0d06fde3aab42d.zip
cacert: simplify setupHook
Triggering this setupHook for dependencies at targetOffset does not work
in cross-compilation cases where such a dependency is lacking. This
simplified setupHook is more robust.
-rw-r--r--pkgs/data/misc/cacert/setup-hook.sh10
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/data/misc/cacert/setup-hook.sh b/pkgs/data/misc/cacert/setup-hook.sh
index e969596752f..77b68a5c251 100644
--- a/pkgs/data/misc/cacert/setup-hook.sh
+++ b/pkgs/data/misc/cacert/setup-hook.sh
@@ -1,7 +1,3 @@
-cacertHook() {
-    export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
-    # left for compatibility
-    export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
-}
-
-addEnvHooks "$targetOffset" cacertHook
+export NIX_SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt
+# left for compatibility
+export SSL_CERT_FILE=@out@/etc/ssl/certs/ca-bundle.crt