josm: minor cleanups

- Use `makeWrapper` to generate wrapper script.

- Use `buildCommand` instead of explicit phases.`

+6 -10
+6 -10
pkgs/applications/misc/josm/default.nix
··· 1 - { fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: 2 3 stdenv.mkDerivation rec { 4 name = "josm-${version}"; ··· 9 sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; 10 }; 11 12 - phases = [ "installPhase" ]; 13 - 14 - buildInputs = [ jre8 ]; 15 16 desktopItem = makeDesktopItem { 17 name = "josm"; ··· 23 categories = "Education;Geoscience;Maps;"; 24 }; 25 26 - installPhase = '' 27 mkdir -p $out/bin $out/share/java 28 cp -v $src $out/share/java/josm.jar 29 - cat > $out/bin/josm <<EOF 30 - #!${bash}/bin/bash 31 - exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@" 32 - EOF 33 - chmod 755 $out/bin/josm 34 35 mkdir -p $out/share/applications 36 cp $desktopItem/share/applications"/"* $out/share/applications
··· 1 + { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: 2 3 stdenv.mkDerivation rec { 4 name = "josm-${version}"; ··· 9 sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; 10 }; 11 12 + buildInputs = [ jre8 makeWrapper ]; 13 14 desktopItem = makeDesktopItem { 15 name = "josm"; ··· 21 categories = "Education;Geoscience;Maps;"; 22 }; 23 24 + buildCommand = '' 25 mkdir -p $out/bin $out/share/java 26 cp -v $src $out/share/java/josm.jar 27 + 28 + makeWrapper ${jre8}/bin/java $out/bin/josm \ 29 + --add-flags "-jar $out/share/java/josm.jar" 30 31 mkdir -p $out/share/applications 32 cp $desktopItem/share/applications"/"* $out/share/applications