diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-06-28 23:17:21 -0400 |
commit | 16be434b0bec4d14a893010b46f56a64cab74cc1 (patch) | |
tree | 25e77807d55c76d42817197d576349478ff500a5 /pkgs/development/libraries/openssl | |
parent | d76bc8ed15cfa21d9f1cc47a06ee1fe8ac86d6d3 (diff) | |
parent | b0ada07f36abc21c990000b5cdbe780157d6b92b (diff) | |
download | nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.gz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.bz2 nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.lz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.xz nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.tar.zst nixlib-16be434b0bec4d14a893010b46f56a64cab74cc1.zip |
Merge accepted cross compilation PRs into staging
Diffstat (limited to 'pkgs/development/libraries/openssl')
-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 0d07513634fb..2120e60ec6aa 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 { @@ -22,8 +24,7 @@ let ++ [ ./nix-ssl-cert-file.patch ] ++ optional (versionOlder version "1.1.0") (if stdenv.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.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" ]; @@ -88,10 +89,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"; }; |