From fd1745b8607349440ff33b113a8b5eb2c5d96c15 Mon Sep 17 00:00:00 2001 From: Markus Theil Date: Mon, 23 Sep 2024 17:57:58 +0200 Subject: [PATCH] openssl_3_3: hotfix for cmake builds Signed-off-by: Markus Theil --- pkgs/development/libraries/openssl/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 0313841dce30..4058ccd6c59f 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -222,8 +222,12 @@ let rm -r $etc/etc/ssl/misc rmdir $etc/etc/ssl/{certs,private} - - ${lib.optionalString (conf != null) "cat ${conf} > $etc/etc/ssl/openssl.cnf"} + '' + lib.optionalString (conf != null) '' + cat ${conf} > $etc/etc/ssl/openssl.cnf + '' + lib.optionalString (lib.versionAtLeast version "3.3.0") '' + # cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config. + # pkg-config gets its paths fixed correctly + rm -rf $dev/lib/cmake ''; postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''