From b087ca23bfc16db1c78b52356f655736bb0e7e1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 07:20:57 -0300 Subject: [PATCH 1/4] numix-icon-theme-circle: 17-12-25 -> 18-02-16 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3de3dbe110c..5cab27d74f7 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "17-12-25"; + version = "18-02-16"; package-name = "numix-icon-theme-circle"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "10sn2w9xzmh7arbw0vn516p9nfym1bs8bf7i8zzvz7y09s61lkxh"; + sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; }; buildInputs = [ numix-icon-theme ]; From 86036cc65d28d15616ee651f571a35723e10dfc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 07:26:25 -0300 Subject: [PATCH 2/4] numix-icon-theme-circle: build GTK icon cache --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 5cab27d74f7..5982074991f 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { version = "18-02-16"; @@ -14,15 +14,19 @@ stdenv.mkDerivation rec { sha256 = "0q08q1czsk6h0dxqscbgryr12xaakp4zbch37z0jxpwh087gnq4f"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (circle version)"; homepage = https://numixproject.org; From cba652b766a1fd108f01e31da9ef8ed66529a42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 07:29:53 -0300 Subject: [PATCH 3/4] numix-icon-theme-square: 17-12-25 -> 18-02-16 --- pkgs/data/icons/numix-icon-theme-square/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 503a66b736f..ac42bc32169 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "${package-name}-${version}"; package-name = "numix-icon-theme-square"; - version = "17-12-25"; + version = "18-02-16"; src = fetchFromGitHub { owner = "numixproject"; repo = package-name; rev = version; - sha256 = "07rcfkz3c1z5fwqiib4r1bm964mpwf1f128xm8kz55xp6w1c7zgl"; + sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; }; buildInputs = [ numix-icon-theme ]; From 52a4d3183fd028309b208f2f45b2658566e72309 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 4 Mar 2018 07:45:36 -0300 Subject: [PATCH 4/4] numix-icon-theme-square: build GTK icon cache --- pkgs/data/icons/numix-icon-theme-square/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index ac42bc32169..198229cce37 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,15 +12,19 @@ stdenv.mkDerivation rec { sha256 = "1gjwc0s6a7q1jby5bcwxkcmbs470m81y8s0clsm0qhcmcn1c36xj"; }; - buildInputs = [ numix-icon-theme ]; - - dontBuild = true; + nativeBuildInputs = [ gtk3 numix-icon-theme ]; installPhase = '' mkdir -p $out/share/icons cp -a Numix-Square{,-Light} $out/share/icons/ ''; + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + meta = with stdenv.lib; { description = "Numix icon theme (square version)"; homepage = https://numixproject.org;