From e7ede726ba80291acfbc66808d0d06fde3aab42d Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Thu, 12 Sep 2019 19:16:58 +0000 Subject: [PATCH] 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. --- pkgs/data/misc/cacert/setup-hook.sh | 10 +++------- 1 file 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