summary refs log tree commit diff
path: root/pkgs/development/libraries/openssl/default.nix
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-05-29 16:08:27 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-05-29 16:08:27 -0700
commitafa5859716914cce8e3d8b13a6692c100bd96723 (patch)
tree8d470a1bdee77daada7126341b233493276a1d08 /pkgs/development/libraries/openssl/default.nix
parent7b1336d2f122dc67c27786eb8122afb4a185f839 (diff)
downloadnixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar.gz
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar.bz2
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar.lz
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar.xz
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.tar.zst
nixpkgs-afa5859716914cce8e3d8b13a6692c100bd96723.zip
openssl: Cleanup some old, untested patches
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
-rw-r--r--pkgs/development/libraries/openssl/default.nix25
1 files changed, 1 insertions, 24 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7f428fd584b..68ddcb68f47 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -10,30 +10,7 @@ let
 
   patchesCross = isCross: let
     isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
-  in
-    [ # Allow the location of the X509 certificate file (the CA
-      # bundle) to be set through the environment variable
-      # ‘OPENSSL_X509_CERT_FILE’.  This is necessary because the
-      # default location ($out/ssl/cert.pem) doesn't exist, and
-      # hardcoding something like /etc/ssl/cert.pem is impure and
-      # cannot be overriden per-process.  For security, the
-      # environment variable is ignored for setuid binaries.
-      # FIXME: drop this patch; it really isn't necessary, because
-      # OpenSSL already supports a ‘SSL_CERT_FILE’ variable.
-      ./cert-file.patch
-    ]
-
-    ++ stdenv.lib.optionals (isCross && opensslCrossSystem == "hurd-x86")
-         [ ./cert-file-path-max.patch # merge with `cert-file.patch' eventually
-           ./gnu.patch                # submitted upstream
-         ]
-
-    ++ stdenv.lib.optionals (stdenv.system == "x86_64-kfreebsd-gnu")
-        [ ./gnu.patch
-          ./kfreebsd-gnu.patch
-        ]
-
-    ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
+  in stdenv.lib.optional isDarwin ./darwin-arch.patch;
 
   extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
 in