Skip to content

openssl_3_3: move cmake rm to correct phase #344139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emilazy merged 1 commit into from
Sep 24, 2024
Merged

openssl_3_3: move cmake rm to correct phase #344139

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/libraries/openssl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@ let
rmdir $etc/etc/ssl/{certs,private}
'' + 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) ''
Expand All @@ -237,6 +233,10 @@ let
echo "Found an erroneous dependency on perl ^^^" >&2
exit 1
fi
'' + 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
'';

passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
Expand Down