pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #139971 from asbachb/key-store-explorer/adjust-jdk

keystore-explorer: use latest available lts java version to run

authored by Timo Kaufmann and committed by GitHub 5e6aaaf2 549044ea

+6 -4
unified split
+3 -3
pkgs/applications/misc/keystore-explorer/default.nix
··· 1 - { fetchzip, lib, stdenv, jdk8, runtimeShell }: 1 + { fetchzip, lib, stdenv, jdk, runtimeShell }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "5.4.4"; ··· 19 19 # Python on Darwin; just write our own start script to avoid unnecessary dependencies 20 20 cat > $out/bin/keystore-explorer <<EOF 21 21 #!${runtimeShell} 22 - export JAVA_HOME=${jdk8.home} 23 - exec ${jdk8}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@" 22 + export JAVA_HOME=${jdk.home} 23 + exec ${jdk}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@" 24 24 EOF 25 25 chmod +x $out/bin/keystore-explorer 26 26
+3 -1
pkgs/top-level/all-packages.nix
··· 6516 6516 6517 6517 keyfuzz = callPackage ../tools/inputmethods/keyfuzz { }; 6518 6518 6519 - keystore-explorer = callPackage ../applications/misc/keystore-explorer { }; 6519 + keystore-explorer = callPackage ../applications/misc/keystore-explorer { 6520 + jdk = jdk11; 6521 + }; 6520 6522 6521 6523 kfctl = callPackage ../applications/networking/cluster/kfctl { }; 6522 6524