diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 11:57:01 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 18:31:37 -0400 |
commit | 60eff17b2799d6e5813a0899d506d455ad360f4b (patch) | |
tree | 81e2780d75f5d5055de9b0df07f50ff42e657f9b /pkgs/development/libraries/openssl/default.nix | |
parent | c23028bdadd3864e15bf25caa1785208db4ae773 (diff) | |
download | nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar.gz nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar.bz2 nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar.lz nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar.xz nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.tar.zst nixlib-60eff17b2799d6e5813a0899d506d455ad360f4b.zip |
openssl: cc-wrapper can be relied on to export these env vars
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 8582c0a1833e..b3ce2fdbbb06 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, buildPackages, perl +, hostPlatform , withCryptodev ? false, cryptodevHeaders -, enableSSL2 ? false }: +, enableSSL2 ? false +}: with stdenv.lib; let - opensslCrossSystem = stdenv.cross.openssl.system or + opensslCrossSystem = hostPlatform.openssl.system or (throw "openssl needs its platform name cross building"); common = args@{ version, sha256, patches ? [] }: stdenv.mkDerivation rec { @@ -23,8 +25,7 @@ let ++ optional (versionOlder version "1.1.0") (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch) ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch - ++ optional - (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) + ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin) ./darwin-arch.patch; outputs = [ "bin" "dev" "out" "man" ]; @@ -89,10 +90,6 @@ let preConfigure='' # It's configure does not like --build or --host export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}" - # WINDRES and RANLIB need to be prefixed when cross compiling; - # the openssl configure script doesn't do that for us - export WINDRES=${stdenv.cross.config}-windres - export RANLIB=${stdenv.cross.config}-ranlib ''; configureScript = "./Configure"; }; |