summary refs log tree commit diff
path: root/pkgs/games
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2020-04-15 14:34:25 +0200
committerGitHub <noreply@github.com>2020-04-15 14:34:25 +0200
commitb5765e6710843f27befd518c7f153f50ac3ba511 (patch)
tree206631499c77f7d77b0e4cb893bb16b485ab1358 /pkgs/games
parent90bc1492ca6139a5e8dba1e64997f30c8e756511 (diff)
parenta35282f8785a505d377c29ff53ab65bd55bbfcb4 (diff)
downloadnixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar.gz
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar.bz2
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar.lz
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar.xz
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.tar.zst
nixpkgs-b5765e6710843f27befd518c7f153f50ac3ba511.zip
Merge pull request #82903 from freepotion/ivan-add-iconset
ivan: add full iconset
Diffstat (limited to 'pkgs/games')
-rw-r--r--pkgs/games/ivan/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/games/ivan/default.nix b/pkgs/games/ivan/default.nix
index 4e8dc5bbbe9..c5a93939a0f 100644
--- a/pkgs/games/ivan/default.nix
+++ b/pkgs/games/ivan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, SDL2, SDL2_mixer, alsaLib, libpng
-, pcre, graphicsmagick, makeDesktopItem }:
+, pcre, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "04jzs8wad2b3g9hvnijr4r89iiw6b1i44zdzkg0dy447lrw6l6xc";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig graphicsmagick ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [ SDL2 SDL2_mixer alsaLib libpng pcre ];
 
@@ -36,12 +36,19 @@ stdenv.mkDerivation rec {
     comment = meta.description;
   };
 
-  # Create appropriate directories. Convert "Icon.bmp" to "ivan.png", then copy
-  # it and "ivan.desktop" to these directories.
+  # Create appropriate directories. Copy icons and desktop item to these directories.
   postInstall = ''
     mkdir -p $out/share/applications
+    mkdir -p $out/share/icons/hicolor/16x16/apps
     mkdir -p $out/share/icons/hicolor/32x32/apps
-    gm convert $src/Graphics/Icon.bmp $out/share/icons/hicolor/32x32/apps/ivan.png
+    mkdir -p $out/share/icons/hicolor/128x128/apps
+    mkdir -p $out/share/icons/hicolor/256x256/apps
+    mkdir -p $out/share/icons/hicolor/512x512/apps
+    cp $src/Graphics/icons/shadowless.iconset/icon_16x16.png $out/share/icons/hicolor/16x16/apps/ivan.png
+    cp $src/Graphics/icons/shadowless.iconset/icon_32x32.png $out/share/icons/hicolor/32x32/apps/ivan.png
+    cp $src/Graphics/icons/shadowless.iconset/icon_128x128.png $out/share/icons/hicolor/128x128/apps/ivan.png
+    cp $src/Graphics/icons/shadowless.iconset/icon_256x256.png $out/share/icons/hicolor/256x256/apps/ivan.png
+    cp $src/Graphics/icons/shadowless.iconset/icon_512x512.png $out/share/icons/hicolor/512x512/apps/ivan.png
     cp ${ivanDesktop}/share/applications/* $out/share/applications
   '';