From cd24a78423c8cebde4e9f7e6a3e27c16dd728f55 Mon Sep 17 00:00:00 2001 From: Ihar Hrachyshka Date: Wed, 22 Oct 2025 17:52:51 -0400 Subject: [PATCH] buildMavenPackage: fix keytool path on darwin zulu jdk build for darwin has different lib/ structure. We should be able to just call /bin/keytool since it's symlinked in both derivations. I think this is a regression since: https://github.com/NixOS/nixpkgs/pull/437528 (cherry picked from commit 524585d1b0fc6634ad5a5df9367f2243b3a3c87e) --- pkgs/by-name/ma/maven/build-maven-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index 6b4aa51d8de5..feae97322575 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -63,7 +63,7 @@ let # handle cacert by populating a trust store on the fly if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then echo "using ''${NIX_SSL_CERT_FILE-} as trust store" - ${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE + ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit" fi