summary refs log tree commit diff
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-09-18 10:14:38 +0200
committerGitHub <noreply@github.com>2018-09-18 10:14:38 +0200
commit874b045cc891e45f7e391a9fca16aa69b45320ff (patch)
tree49e30cfa7453a4be16cc1d30b403e10fec19e758
parent108de377d283e09882a4646bd4ce5ac1c0243a86 (diff)
parent04974889394f8c0163d558a940a1c8b29498056f (diff)
downloadnixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar.gz
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar.bz2
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar.lz
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar.xz
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.tar.zst
nixlib-874b045cc891e45f7e391a9fca16aa69b45320ff.zip
Merge pull request #46809 from romildo/upd.elementary-xfce
elementary-xfce-icon-theme: 0.12 -> 0.13
-rw-r--r--pkgs/data/icons/elementary-xfce-icon-theme/default.nix24
1 files changed, 11 insertions, 13 deletions
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index 4b3f7f54ad1a..c457a8c69ec8 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,34 +1,32 @@
-{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "elementary-xfce-icon-theme-${version}";
-  version = "0.12";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "shimmerproject";
     repo = "elementary-xfce";
-    rev = "elementary-xfce-${version}";
-    sha256 = "036676443sj4lxm7z211b0br87zdnbrb9z41czfq65r1wwwdf3rq";
+    rev = "v${version}";
+    sha256 = "01hlpw4vh4kgyghki01jp0snbn0g79mys28fb1m993mivnlzmn75";
   };
 
-  nativeBuildInputs = [ gtk3 hicolor-icon-theme ];
+  nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
 
-  installPhase = ''
-    mkdir -p $out/share/icons
-    mv elementary-xfce* $out/share/icons
+  postPatch = ''
+    substituteInPlace svgtopng/Makefile --replace "-O0" "-O"
   '';
 
-  postFixup = ''
-    for theme in $out/share/icons/*; do
-      gtk-update-icon-cache $theme
-    done
+  postInstall = ''
+    make icon-caches
   '';
 
   meta = with stdenv.lib; {
     description = "Elementary icons for Xfce and other GTK+ desktops like GNOME";
     homepage = https://github.com/shimmerproject/elementary-xfce;
     license = licenses.gpl2;
-    platforms = platforms.unix;
+    # darwin cannot deal with file names differing only in case
+    platforms = platforms.linux;
     maintainers = with maintainers; [ davidak ];
   };
 }