nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-01 15:11:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert #156510: openssl: stop static binaries referencing libs

Browse Source 
This reverts commit 71f1f4884b.
It seems like too problematic at this point; see PR comments below
https://github.com/NixOS/nixpkgs/pull/156510#issuecomment-1058532765
This commit is contained in:
Vladimír Čunát 2022-03-24 10:36:10 +01:00
parent a7ccddeb54
commit 195c7da07d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/development/libraries/openssl/default.nix
View File

@ -45,7 +45,7 @@ let
'!defined(__ANDROID__) && !defined(__OpenBSD__) && 0'
'';
outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optional withDocs "doc";
outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc";
setOutputFlags = false;
separateDebugInfo =
!stdenv.hostPlatform.isDarwin &&
@ -94,7 +94,7 @@ let
dontAddStaticConfigureFlags = true;
configureFlags = [
"shared" # "shared" builds both shared and static libraries
"--libdir=${placeholder "lib"}/lib"
"--libdir=lib"
"--openssldir=etc/ssl"
] ++ lib.optionals withCryptodev [
"-DHAVE_CRYPTODEV"
@ -103,7 +103,6 @@ let
++ lib.optional enableSSL3 "enable-ssl3"
++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls"
++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng"
++ lib.optional static "disable-dynamic-engine"
# 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.
@ -118,21 +117,8 @@ let
"MANSUFFIX=ssl"
];
buildFlags = lib.optionals static [
# Even though engines are disabled in static builds, we have to
# override ENGINESDIR so the bin output doesn't end up with an
# reference to the lib output.
"ENGINESDIR=/"
];
enableParallelBuilding = true;
preInstall = lib.optionalString static ''
# Build system wants to be able to create the engines directory
# even though nothing will get installed to it.
installFlagsArray+=(ENGINESDIR="$NIX_BUILD_TOP/engines")
'';
postInstall =
lib.optionalString (!static) ''
# If we're building dynamic libraries, then don't install static