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

Merge #2823: better cygwin support, also add x86_64

Browse Source 
Conflicts (easy):
	pkgs/development/interpreters/perl/5.16/default.nix
This commit is contained in:
Vladimír Čunát
2014-08-14 20:38:09 +02:00
parent 59291fdbf4 86e18c965f
commit d1ed0f44cd
4 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,12 @@ stdenv.mkDerivation {
else "./config";
configureFlags = "shared --libdir=lib --openssldir=etc/ssl" +
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS";
stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS" +
stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") " no-asm";
preBuild = stdenv.lib.optionalString (stdenv.system == "x86_64-cygwin") ''
sed -i -e "s|-march=i486|-march=x86-64|g" Makefile
'';
makeFlags = "MANDIR=$(out)/share/man";