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

1 files changed, 2 insertions, 16 deletions

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1155e51d52bbe..33ddbf7018c50 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -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