From b80d254e734d4ee1cc8bf3de203ea5dc5a265a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 17 Sep 2018 19:31:29 -0300 Subject: [PATCH 1/2] elementary-xfce-icon-theme: 0.12 -> 0.13 --- .../elementary-xfce-icon-theme/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b3f7f54ad1..9aa61e856ff 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,27 +1,24 @@ -{ 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; { From 04974889394f8c0163d558a940a1c8b29498056f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 17 Sep 2018 20:21:09 -0300 Subject: [PATCH 2/2] elementary-xfce-icon-theme: restrict platforms to linux --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 9aa61e856ff..c457a8c69ec 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { 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 ]; }; }