diff options
author | Jan Malakhovski <oxij@oxij.org> | 2018-08-08 19:00:07 +0000 |
---|---|---|
committer | Jan Malakhovski <oxij@oxij.org> | 2018-08-10 12:56:34 +0000 |
commit | 7ea0904347c137b0a02e0a5c8d2bfc282a93ae81 (patch) | |
tree | 68247f0e17e43e31469b5342919eecf4c343cd3b /pkgs/development/libraries/openssl/default.nix | |
parent | 86999f68831907a1fda614d87bcbb8a492654b57 (diff) | |
download | nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar.gz nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar.bz2 nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar.lz nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar.xz nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.tar.zst nixlib-7ea0904347c137b0a02e0a5c8d2bfc282a93ae81.zip |
openssl: fix tests, also cleanup
Diffstat (limited to 'pkgs/development/libraries/openssl/default.nix')
-rw-r--r-- | pkgs/development/libraries/openssl/default.nix | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 35538b99060e..7f8f222c00ea 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -24,11 +24,19 @@ let ++ optional (versionOlder version "1.0.2" && hostPlatform.isDarwin) ./darwin-arch.patch; - postPatch = if (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) then '' - substituteInPlace crypto/async/arch/async_posix.h \ - --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ - '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' - '' else null; + postPatch = '' + patchShebangs Configure + '' + optionalString (versionOlder version "1.1.0") '' + patchShebangs test/* + for a in test/t* ; do + substituteInPlace "$a" \ + --replace /bin/rm rm + done + '' + optionalString (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isMusl) '' + substituteInPlace crypto/async/arch/async_posix.h \ + --replace '!defined(__ANDROID__) && !defined(__OpenBSD__)' \ + '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' + ''; outputs = [ "bin" "dev" "out" "man" ]; setOutputFlags = false; @@ -38,6 +46,7 @@ let buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders; # TODO(@Ericson2314): Improve with mass rebuild + configurePlatforms = []; configureScript = { "x86_64-darwin" = "./Configure darwin64-x86_64-cc"; "x86_64-solaris" = "./Configure solaris64-x86_64-gcc"; @@ -56,13 +65,6 @@ let throw "Not sure what configuration to use for ${hostPlatform.config}" ); - # TODO(@Ericson2314): Make unconditional on mass rebuild - ${if buildPlatform != hostPlatform then "configurePlatforms" else null} = []; - - preConfigure = '' - patchShebangs Configure - ''; - configureFlags = [ "shared" # "shared" builds both shared and static libraries "--libdir=lib" |