JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Benjamin Asbach 2021-09-29 16:52:18 -06:00
parent 31ffc50c57
commit b5cc607558
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/keystore-explorer/default.nix
View File

@ -1,4 +1,4 @@
{ fetchzip, lib, stdenv, jdk8, runtimeShell }:
{ fetchzip, lib, stdenv, jdk, runtimeShell }:
stdenv.mkDerivation rec {
version = "5.4.4";
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
# Python on Darwin; just write our own start script to avoid unnecessary dependencies
cat > $out/bin/keystore-explorer <<EOF
#!${runtimeShell}
export JAVA_HOME=${jdk8.home}
exec ${jdk8}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@"
export JAVA_HOME=${jdk.home}
exec ${jdk}/bin/java -jar $out/share/keystore-explorer/kse.jar "\$@"
EOF
chmod +x $out/bin/keystore-explorer

4
pkgs/top-level/all-packages.nix
View File

@ -6485,7 +6485,9 @@ with pkgs;
keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
keystore-explorer = callPackage ../applications/misc/keystore-explorer { };
keystore-explorer = callPackage ../applications/misc/keystore-explorer {
jdk = jdk11;
};
kfctl = callPackage ../applications/networking/cluster/kfctl { };