gpsprune: use latest jdk

gstqt5
Gabriel Ebner 2020-09-20 11:25:44 +02:00
parent 3426068afe
commit effd6aa53a
1 changed files with 3 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk11 }: { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, jdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gpsprune"; pname = "gpsprune";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk11 ]; buildInputs = [ jdk ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "gpsprune"; name = "gpsprune";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildCommand = '' buildCommand = ''
mkdir -p $out/bin $out/share/java mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/gpsprune.jar cp -v $src $out/share/java/gpsprune.jar
makeWrapper ${jdk11}/bin/java $out/bin/gpsprune \ makeWrapper ${jdk}/bin/java $out/bin/gpsprune \
--add-flags "-jar $out/share/java/gpsprune.jar" --add-flags "-jar $out/share/java/gpsprune.jar"
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications