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 }: 1 + { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "josm-${version}"; ··· 9 9 sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; 10 10 }; 11 11 12 - phases = [ "installPhase" ]; 13 - 14 - buildInputs = [ jre8 ]; 12 + buildInputs = [ jre8 makeWrapper ]; 15 13 16 14 desktopItem = makeDesktopItem { 17 15 name = "josm"; ··· 23 21 categories = "Education;Geoscience;Maps;"; 24 22 }; 25 23 26 - installPhase = '' 24 + buildCommand = '' 27 25 mkdir -p $out/bin $out/share/java 28 26 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 27 + 28 + makeWrapper ${jre8}/bin/java $out/bin/josm \ 29 + --add-flags "-jar $out/share/java/josm.jar" 34 30 35 31 mkdir -p $out/share/applications 36 32 cp $desktopItem/share/applications"/"* $out/share/applications