Commit 524585d1 authored by Ihar Hrachyshka's avatar Ihar Hrachyshka
Browse files

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
parent ea15dc69

pkgs/by-name/ma/maven/build-maven-package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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