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

josm: minor cleanups

Browse Source 
- Use `makeWrapper` to generate wrapper script.

- Use `buildCommand` instead of explicit phases.`
This commit is contained in:
Robert Helgesson 2017-09-14 12:04:23 +02:00
parent fd4d957ac4
commit 2a36c6c185
No known key found for this signature in database
GPG Key ID: C3DB11069E65DC86
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: { fetchurl, stdenv, makeDesktopItem, makeWrapper, unzip, bash, jre8 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "josm-${version}"; name = "josm-${version}";
@ -9,9 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf"; sha256 = "0lpz4yzkvjpn5g36nibrkh773jnlkiqj6lghsx69i86h0xfb7gqf";
}; };
phases = [ "installPhase" ]; buildInputs = [ jre8 makeWrapper ];
buildInputs = [ jre8 ];
desktopItem = makeDesktopItem { desktopItem = makeDesktopItem {
name = "josm"; name = "josm";
@ -23,14 +21,12 @@ stdenv.mkDerivation rec {
categories = "Education;Geoscience;Maps;"; categories = "Education;Geoscience;Maps;";
}; };
installPhase = '' buildCommand = ''
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
cat > $out/bin/josm <<EOF
#!${bash}/bin/bash makeWrapper ${jre8}/bin/java $out/bin/josm \
exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@" --add-flags "-jar $out/share/java/josm.jar"
EOF
chmod 755 $out/bin/josm
mkdir -p $out/share/applications mkdir -p $out/share/applications
cp $desktopItem/share/applications"/"* $out/share/applications cp $desktopItem/share/applications"/"* $out/share/applications