git.iko.soy/typeable/nixpkgs
on master help sign in
keystore-explorer: use latest available lts java version to run keystore-explorer
commitb5cc60755857bc98c593c4f0d7fad50707577ba8 authorBenjamin Asbach <asbachb@users.noreply.github.com> dateWed 29 Sep 2021, 16:52 (5 years ago) parent31ffc50
2 files changed+6−4
compare with master
unifiedsplit
pkgs/applications/misc/keystore-explorer/default.nix+3−3 pkgs/top-level/all-packages.nix+3−1
pkgs/applications/misc/keystore-explorer/default.nix+3−3
@@ -1,4 +1,4 @@
1−{ fetchzip, lib, stdenv, jdk8, runtimeShell }:
1+{ fetchzip, lib, stdenv, jdk, runtimeShell }:
22
33stdenv.mkDerivation rec {
44 version = "5.4.4";
@@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
1919 # Python on Darwin; just write our own start script to avoid unnecessary dependencies
2020 cat > $out/bin/keystore-explorer <<EOF
2121 #!${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 "\$@"
2424 EOF
2525 chmod +x $out/bin/keystore-explorer
2626
pkgs/top-level/all-packages.nix+3−1
@@ -6485,7 +6485,9 @@ with pkgs;
64856485
64866486 keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
64876487
6488− keystore-explorer = callPackage ../applications/misc/keystore-explorer { };
6488+ keystore-explorer = callPackage ../applications/misc/keystore-explorer {
6489+ jdk = jdk11;
6490+ };
64896491
64906492 kfctl = callPackage ../applications/networking/cluster/kfctl { };
64916493