Revert #156510: openssl: stop static binaries referencing libs

This reverts commit 71f1f4884b5e40ae6647fa7f0f1890554ad6aa7d.
It seems like too problematic at this point; see PR comments below
https://github.com/NixOS/nixpkgs/pull/156510#issuecomment-1058532765

+2 -16
+2 -16
pkgs/development/libraries/openssl/default.nix
··· 45 45 '!defined(__ANDROID__) && !defined(__OpenBSD__) && 0' 46 46 ''; 47 47 48 - outputs = [ "bin" "dev" "out" "lib" "man" ] ++ lib.optional withDocs "doc"; 48 + outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional withDocs "doc"; 49 49 setOutputFlags = false; 50 50 separateDebugInfo = 51 51 !stdenv.hostPlatform.isDarwin && ··· 94 94 dontAddStaticConfigureFlags = true; 95 95 configureFlags = [ 96 96 "shared" # "shared" builds both shared and static libraries 97 - "--libdir=${placeholder "lib"}/lib" 97 + "--libdir=lib" 98 98 "--openssldir=etc/ssl" 99 99 ] ++ lib.optionals withCryptodev [ 100 100 "-DHAVE_CRYPTODEV" ··· 103 103 ++ lib.optional enableSSL3 "enable-ssl3" 104 104 ++ lib.optional (lib.versionAtLeast version "3.0.0") "enable-ktls" 105 105 ++ lib.optional (lib.versionAtLeast version "1.1.0" && stdenv.hostPlatform.isAarch64) "no-afalgeng" 106 - ++ lib.optional static "disable-dynamic-engine" 107 106 # OpenSSL needs a specific `no-shared` configure flag. 108 107 # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options 109 108 # for a comprehensive list of configuration options. ··· 118 117 "MANSUFFIX=ssl" 119 118 ]; 120 119 121 - buildFlags = lib.optionals static [ 122 - # Even though engines are disabled in static builds, we have to 123 - # override ENGINESDIR so the bin output doesn't end up with an 124 - # reference to the lib output. 125 - "ENGINESDIR=/" 126 - ]; 127 - 128 120 enableParallelBuilding = true; 129 - 130 - preInstall = lib.optionalString static '' 131 - # Build system wants to be able to create the engines directory 132 - # even though nothing will get installed to it. 133 - installFlagsArray+=(ENGINESDIR="$NIX_BUILD_TOP/engines") 134 - ''; 135 121 136 122 postInstall = 137 123 lib.optionalString (!static) ''