Merge pull request #36284 from romildo/upd.numix-icon-theme

numix-icon-theme-circle,numix-icon-theme-square: 17-12-25 -> 18-02-16, build GTK icon cache

authored by Jörg Thalheim and committed by GitHub f13f8c95 cac09e6c

+20 -12
+10 -6
pkgs/data/icons/numix-icon-theme-circle/default.nix
··· 1 - { stdenv, fetchFromGitHub, numix-icon-theme }: 1 + { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: 2 2 3 3 stdenv.mkDerivation rec { 4 - version = "17-12-25"; 4 + version = "18-02-16"; 5 5 6 6 package-name = "numix-icon-theme-circle"; 7 7 ··· 11 11 owner = "numixproject"; 12 12 repo = package-name; 13 13 rev = version; 14 - sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; 14 + sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; 15 15 }; 16 16 17 - buildInputs = [ numix-icon-theme ]; 18 - 19 - dontBuild = true; 17 + nativeBuildInputs = [ gtk3 numix-icon-theme ]; 20 18 21 19 installPhase = '' 22 20 install -dm 755 $out/share/icons 23 21 cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ 22 + ''; 23 + 24 + postFixup = '' 25 + for theme in $out/share/icons/*; do 26 + gtk-update-icon-cache $theme 27 + done 24 28 ''; 25 29 26 30 meta = with stdenv.lib; {
+10 -6
pkgs/data/icons/numix-icon-theme-square/default.nix
··· 1 - { stdenv, fetchFromGitHub, numix-icon-theme }: 1 + { stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "${package-name}-${version}"; 5 5 package-name = "numix-icon-theme-square"; 6 - version = "17-12-25"; 6 + version = "18-02-16"; 7 7 8 8 src = fetchFromGitHub { 9 9 owner = "numixproject"; 10 10 repo = package-name; 11 11 rev = version; 12 - sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; 12 + sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; 13 13 }; 14 14 15 - buildInputs = [ numix-icon-theme ]; 16 - 17 - dontBuild = true; 15 + nativeBuildInputs = [ gtk3 numix-icon-theme ]; 18 16 19 17 installPhase = '' 20 18 mkdir -p $out/share/icons 21 19 cp -a Numix-Square{,-Light} $out/share/icons/ 20 + ''; 21 + 22 + postFixup = '' 23 + for theme in $out/share/icons/*; do 24 + gtk-update-icon-cache $theme 25 + done 22 26 ''; 23 27 24 28 meta = with stdenv.lib; {