diff options
| author | Marko Durkovic <marko@miding.de> | 2014-10-23 16:28:20 +0200 |
|---|---|---|
| committer | Rok Garbas <rok@garbas.si> | 2015-05-28 10:53:35 +0200 |
| commit | 3f6949c3ef358f28b5f90d9766c33aed8a78a9de (patch) | |
| tree | 37810bd88a40c20f75016f1eeb67b921d4ac1eb9 /pkgs/development/libraries/openssl/default.nix | |
| parent | 67ac12795a453b20288b8e28e83cdf5dc8cbf8da (diff) | |
| download | nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar.gz nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar.bz2 nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar.lz nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar.xz nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.tar.zst nixpkgs-3f6949c3ef358f28b5f90d9766c33aed8a78a9de.zip | |
cygwin: openssl for x86_64
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 7255e91f282..7f428fd584b 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -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"; |