cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
keystore-explorer: use latest available lts java version to run
This commit is contained in:
Timo Kaufmann 2021-10-04 15:56:30 +02:00 committed by GitHub
commit 5e6aaaf238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -6516,7 +6516,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 { };