diff options
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
| -rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 48574a332c8d..640b99df5473 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -2,7 +2,7 @@ , withCryptodev ? false, cryptodevHeaders }: let - name = "openssl-1.0.0i"; + name = "openssl-1.0.1e"; opensslCrossSystem = stdenv.lib.attrByPath [ "openssl" "system" ] (throw "openssl needs its platform name cross building" null) @@ -30,7 +30,7 @@ let ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch; - + in stdenv.mkDerivation { @@ -41,30 +41,33 @@ stdenv.mkDerivation { "http://www.openssl.org/source/${name}.tar.gz" "http://openssl.linux-mirror.org/source/${name}.tar.gz" ]; - sha1 = "b7aa11cbd7d264c2b1f44e3d55b334fb33f7b674"; + sha256 = "1qqskk39jh85fvdn3ycmdqjdf67c0b97dwmmbcysl4gzr3l1akzp"; }; patches = patchesCross false; buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; - buildNativeInputs = [ perl ]; + nativeBuildInputs = [ perl ]; # On x86_64-darwin, "./config" misdetects the system as # "darwin-i386-cc". So specify the system type explicitly. configureScript = if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc" else "./config"; - configureFlags = "shared --libdir=lib" + + configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; makeFlags = "MANDIR=$(out)/share/man"; + # Parallel building is broken in OpenSSL. + #enableParallelBuilding = true; + postInstall = '' # If we're building dynamic libraries, then don't install static # libraries. - if [ -n "$(echo $out/lib/*.so)" ]; then + if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then rm $out/lib/*.a fi ''; # */ |