From b333a2cb19fd9115bf6f24f9260eeb7727b88598 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 16 Jun 2015 14:17:25 +0200 Subject: [PATCH] openssl: remove some cruft --- pkgs/development/libraries/openssl/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 6aa0b28b238..f0212aeabee 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -42,10 +42,6 @@ stdenv.mkDerivation { configureFlags = "shared --libdir=lib --openssldir=etc/ssl" + stdenv.lib.optionalString withCryptodev " -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"; - # CYGXXX: used to be set for cygwin with optionalString. Not needed - # anymore but kept to prevent rebuild. - preBuild = ""; - makeFlags = "MANDIR=$(out)/share/man"; # Parallel building is broken in OpenSSL. @@ -56,12 +52,12 @@ stdenv.mkDerivation { # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib)" ]; then - rm $out/lib/*.a + rm "$out/lib/"*.a fi # remove dependency on Perl at runtime rm -rf $out/etc/ssl/misc - ''; # */ + ''; crossAttrs = { patches = patchesCross true;