summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorJude Taylor <me@jude.bio>2016-02-24 13:32:58 -0800
committerJude Taylor <me@jude.bio>2016-02-24 13:33:16 -0800
commitb6ff8f9314359df78a7e846dec3cb0319983d0f9 (patch)
tree81b7df586566f4b3f4fb4ff75df973621ddeac4d /pkgs
parentb16dc8dcc53d1910092d8dc2f30851eef2060c16 (diff)
downloadnixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar.gz
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar.bz2
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar.lz
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar.xz
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.tar.zst
nixlib-b6ff8f9314359df78a7e846dec3cb0319983d0f9.zip
disable darwin-arch.patch on openssl >= 1.0.2
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/openssl/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6300068f09fe..db17e0cd73ae 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -21,7 +21,7 @@ let
     patches =
       [ ./use-etc-ssl-certs.patch ]
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
-      ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
+      ++ optional (stdenv.lib.versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch;
 
     nativeBuildInputs = [ perl ];
     buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;