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

josm: bump to jre10

Browse Source 
Fixes https://josm.openstreetmap.de/ticket/11806
This commit is contained in:
Léo Gaspard 2018-07-06 00:41:53 +09:00 committed by Robert Helgesson
parent 151afd2457
commit 806e5a3882
No known key found for this signature in database
GPG Key ID: 36BDAA14C2797E89
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/misc/josm/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre10 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "josm-${version}"; name = "josm-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf"; sha256 = "1j98wxw84f5rf3finr38bkr1sh9ckah8pmhmxyhmcw2rxf1mv9bf";
}; };
buildInputs = [ jre8 makeWrapper ]; buildInputs = [ jre10 makeWrapper ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "josm"; name = "josm";
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out/share/java mkdir -p $out/bin $out/share/java
cp -v $src $out/share/java/josm.jar cp -v $src $out/share/java/josm.jar
makeWrapper ${jre8}/bin/java $out/bin/josm \ makeWrapper ${jre10}/bin/java $out/bin/josm \
--add-flags "-jar $out/share/java/josm.jar" --add-flags "-jar $out/share/java/josm.jar"
mkdir -p $out/share/applications mkdir -p $out/share/applications