diff options
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 0d07513634fb4..2120e60ec6aae 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"; }; |