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

cygwin: openssl for x86_64

Browse Source
This commit is contained in:
Marko Durkovic
2015-05-28 10:53:35 +02:00
committed by Rok Garbas
parent 67ac12795a
commit 3f6949c3ef
2 changed files with 142 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/openssl/default.nix
+6 -6
View File
@@ -35,6 +35,7 @@ let
++ stdenv.lib.optional isDarwin ./darwin-arch.patch;
extraPatches = stdenv.lib.optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
in
stdenv.mkDerivation {
@@ -48,7 +49,7 @@ stdenv.mkDerivation {
sha256 = "0x7gvyybmqm4lv62mlhlm80f1rn7il2qh8224rahqv0i15xhnpq9";
};
patches = patchesCross false;
patches = (patchesCross false) ++ extraPatches;
buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
@@ -62,12 +63,11 @@ stdenv.mkDerivation {
else "./config";
configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +
stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm";
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") ''
sed -i -e "s|-march=i486|-march=x86-64|g" Makefile
'';
# CYGXXX: used to be set for cygwin with optionalString. Not needed
# anymore but kept to prevent rebuild.
preBuild = "";
makeFlags = "MANDIR=$(out)/share/man";