diff options
author | goibhniu <cillian.deroiste@gmail.com> | 2016-01-11 00:47:09 +0100 |
---|---|---|
committer | goibhniu <cillian.deroiste@gmail.com> | 2016-01-11 00:47:09 +0100 |
commit | 3a4d07e4d31c67203b31cc2c03099448c2a783a8 (patch) | |
tree | 60d7e08259b780c696e1efa58408d17d5c11872e /pkgs/applications/misc | |
parent | d0f12c6b0f4e55a34deabc93ec8ce8ede1081cee (diff) | |
parent | 69ba5b12d981375c6a6d4311f0fe9b05a6c63a5a (diff) | |
download | nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar.gz nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar.bz2 nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar.lz nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar.xz nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.tar.zst nixpkgs-3a4d07e4d31c67203b31cc2c03099448c2a783a8.zip |
Merge pull request #11960 from rycee/add-desktop-items
Add desktop items for josm and gpsprune
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/gpsprune/default.nix | 18 | ||||
-rw-r--r-- | pkgs/applications/misc/josm/default.nix | 18 |
2 files changed, 34 insertions, 2 deletions
diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index dead3b83dcf..04d3b7874b4 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "gpsprune-${version}"; @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ jre8 ]; + desktopItem = makeDesktopItem { + name = "gpsprune"; + exec = "gpsprune"; + icon = "gpsprune"; + desktopName = "GpsPrune"; + genericName = "GPS Data Editor"; + comment = meta.description; + categories = "Education;Geoscience;"; + }; + installPhase = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/gpsprune.jar @@ -21,6 +31,11 @@ stdenv.mkDerivation rec { exec ${jre8}/bin/java -jar $out/share/java/gpsprune.jar "\$@" EOF chmod 755 $out/bin/gpsprune + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + mkdir -p $out/share/pixmaps + ${unzip}/bin/unzip -p $src tim/prune/gui/images/window_icon_64.png > $out/share/pixmaps/gpsprune.png ''; meta = with stdenv.lib; { @@ -28,5 +43,6 @@ stdenv.mkDerivation rec { homepage = http://activityworkshop.net/software/gpsprune/; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index b6e8f69131f..9bd7bbb4385 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, bash, jre8 }: +{ fetchurl, stdenv, makeDesktopItem, unzip, bash, jre8 }: stdenv.mkDerivation rec { name = "josm-${version}"; @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { buildInputs = [ jre8 ]; + desktopItem = makeDesktopItem { + name = "josm"; + exec = "josm"; + icon = "josm"; + desktopName = "JOSM"; + genericName = "OpenStreetMap Editor"; + comment = meta.description; + categories = "Education;Geoscience;Maps;"; + }; + installPhase = '' mkdir -p $out/bin $out/share/java cp -v $src $out/share/java/josm.jar @@ -21,6 +31,11 @@ stdenv.mkDerivation rec { exec ${jre8}/bin/java -jar $out/share/java/josm.jar "\$@" EOF chmod 755 $out/bin/josm + + mkdir -p $out/share/applications + cp $desktopItem/share/applications"/"* $out/share/applications + mkdir -p $out/share/pixmaps + ${unzip}/bin/unzip -p $src images/logo_48x48x32.png > $out/share/pixmaps/josm.png ''; meta = with stdenv.lib; { @@ -28,5 +43,6 @@ stdenv.mkDerivation rec { homepage = https://josm.openstreetmap.de/; license = licenses.gpl2Plus; maintainers = [ maintainers.rycee ]; + platforms = platforms.all; }; } |