public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl: Use Darwin patch for cross-builds too.

Browse Source 
Might be better to have something like stdenv.isDarwinTarget, which can
be used to test for native Darwin _and_ cross-built Darwin as a target.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-03-12 06:25:54 +01:00
parent 2d17335f68
commit 5e95800f26
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/openssl/default.nix
View File

@ -8,7 +8,9 @@ let
(throw "openssl needs its platform name cross building" null) (throw "openssl needs its platform name cross building" null)
stdenv.cross; stdenv.cross;
patchesCross = isCross: patchesCross = isCross: let
isDarwin = stdenv.isDarwin || (isCross && stdenv.cross.libc == "libSystem");
in
[ # Allow the location of the X509 certificate file (the CA [ # Allow the location of the X509 certificate file (the CA
# bundle) to be set through the environment variable # bundle) to be set through the environment variable
# ‘OPENSSL_X509_CERT_FILE’. This is necessary because the # ‘OPENSSL_X509_CERT_FILE’. This is necessary because the
@ -29,7 +31,7 @@ let
./kfreebsd-gnu.patch ./kfreebsd-gnu.patch
] ]
++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; ++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
in in