diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:31 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-14 16:01:54 +0200 |
| commit | 811b876fab58ba8795727b35897f9d35f7aa9407 (patch) | |
| tree | e40ae48a763f6d2856e6be7f355960f8ab7eb147 /pkgs/development/libraries/openssl | |
| parent | 24de66ce48c2cc7368760badd3ea3fccf7e734a5 (diff) | |
| download | nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.gz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.bz2 nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.lz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.xz nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.tar.zst nixlib-811b876fab58ba8795727b35897f9d35f7aa9407.zip | |
Revert "openssl, curl, git: Respect $NIX_SSL_CERT_FILE"
This reverts commit 942dbf89c6120cb5b52fb2ab456855d1fbf2994e. Sorry, this was supposed to go to staging instead of master...
Diffstat (limited to 'pkgs/development/libraries/openssl')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/libraries/openssl/nix-ssl-cert-file.patch | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6aefc8b79723..ea89bb859e5f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -19,7 +19,6 @@ let patches = (args.patches or []) - ++ [ ./nix-ssl-cert-file.patch ] ++ optional (versionOlder version "1.1.0") ./use-etc-ssl-certs.patch ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch ++ optional diff --git a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch b/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch deleted file mode 100644 index 4b3c6f458b4c..000000000000 --- a/pkgs/development/libraries/openssl/nix-ssl-cert-file.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru -x '*~' openssl-1.0.2j-orig/crypto/x509/by_file.c openssl-1.0.2j/crypto/x509/by_file.c ---- openssl-1.0.2j-orig/crypto/x509/by_file.c 2016-09-26 11:49:07.000000000 +0200 -+++ openssl-1.0.2j/crypto/x509/by_file.c 2016-10-13 16:54:31.400288302 +0200 -@@ -97,7 +97,10 @@ - switch (cmd) { - case X509_L_FILE_LOAD: - if (argl == X509_FILETYPE_DEFAULT) { -- file = (char *)getenv(X509_get_default_cert_file_env()); -+ file = (char *)getenv("NIX_SSL_CERT_FILE"); -+ if (!file) -+ file = (char *)getenv(X509_get_default_cert_file_env()); -+ fprintf(stderr, "OPEN %s", file); - if (file) - ok = (X509_load_cert_crl_file(ctx, file, - X509_FILETYPE_PEM) != 0); |