diff options
| author | Alyssa Ross <hi@alyssa.is> | 2020-01-22 15:26:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-01-22 16:56:33 +0000 |
| commit | 542f80867c380b0ac79250b6e5358dda8bc49e0d (patch) | |
| tree | aa5903f228b2f32c524a9a6e4f6dd94f8c5b869e /nixpkgs/pkgs/development/libraries/openssl | |
| parent | f69898c7d5b757342e6ab90d5fcc7c9aea9f5ff4 (diff) | |
| parent | 90441b4b47fc7280de6a5bd1a228017caaa0f97f (diff) | |
| download | nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.gz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.bz2 nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.lz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.xz nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.tar.zst nixlib-542f80867c380b0ac79250b6e5358dda8bc49e0d.zip | |
Merge commit '90441b4b47fc7280de6a5bd1a228017caaa0f97f'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/openssl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/openssl/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/openssl/default.nix b/nixpkgs/pkgs/development/libraries/openssl/default.nix index 118aa984c174..63657cfc5e6e 100644 --- a/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -36,7 +36,7 @@ let outputs = [ "bin" "dev" "out" "man" ] ++ optional withDocs "doc"; setOutputFlags = false; - separateDebugInfo = stdenv.hostPlatform.isLinux; + separateDebugInfo = !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; nativeBuildInputs = [ perl ]; buildInputs = stdenv.lib.optional withCryptodev cryptodev; @@ -72,7 +72,11 @@ let "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2" - ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"; + ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" + # OpenSSL needs a specific `no-shared` configure flag. + # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options + # for a comprehensive list of configuration options. + ++ stdenv.lib.optional (versionAtLeast version "1.1.0" && static) "no-shared"; makeFlags = [ "MANDIR=$(man)/share/man" |