From ac5d822f3917729e4a829e27087c7098e1227fce Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Wed, 14 Jul 2021 11:27:38 -0300
Subject: qogir-icon-theme: 2020-11-22 -> 2021-07-14

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/data')

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index e647b02f010..266fd561bd4 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qogir-icon-theme";
-  version = "2020-11-22";
+  version = "2021-07-14";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "04rkpsiz8jg9i55mslsh7a6wgyp30ja3xss7qacqimdab236300d";
+    sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2";
   };
 
   nativeBuildInputs = [ gtk3 ];
-- 
cgit 1.4.1


From 6f6d4a12c1888042d23257aaa98f5c3c78f2cae4 Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Wed, 14 Jul 2021 11:28:42 -0300
Subject: qogir-icon-theme: run installPhase hooks

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pkgs/data')

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 266fd561bd4..e7e1e51d7e1 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
   dontDropIconThemeCache = true;
 
   installPhase = ''
+    runHook preInstall
     patchShebangs install.sh
     mkdir -p $out/share/icons
     name= ./install.sh -d $out/share/icons
+    runHook postInstall
   '';
 
   meta = with lib; {
-- 
cgit 1.4.1


From 2a99a029c55a1cf9ec7dc24181d72a2c0ceac687 Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Wed, 14 Jul 2021 11:30:47 -0300
Subject: qogir-icon-theme: fix license

---
 pkgs/data/icons/qogir-icon-theme/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/data')

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index e7e1e51d7e1..7e03ca53d81 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Flat colorful design icon theme";
     homepage = "https://github.com/vinceliuice/Qogir-icon-theme";
-    license = with licenses; [ gpl3 ];
+    license = with licenses; [ gpl3Only ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];
   };
-- 
cgit 1.4.1


From 6159106f30bc7025ee3925eb9e25352a01c9b668 Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Wed, 14 Jul 2021 11:31:25 -0300
Subject: qogir-icon-theme: make relative symlinks for duplicates

This approximately halves the size of the package
---
 pkgs/data/icons/qogir-icon-theme/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'pkgs/data')

diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index 7e03ca53d81..00de4f6760c 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
 
 stdenv.mkDerivation rec {
   pname = "qogir-icon-theme";
@@ -11,17 +11,22 @@ stdenv.mkDerivation rec {
     sha256 = "0anma2ss3yqr9njx4ay2nyxjkgnj7ky17c93ipwgrvgsv8jk5nn2";
   };
 
-  nativeBuildInputs = [ gtk3 ];
+  nativeBuildInputs = [ gtk3 jdupes ];
 
   propagatedBuildInputs = [ hicolor-icon-theme ];
 
   dontDropIconThemeCache = true;
 
+  # These fixup steps are slow and unnecessary.
+  dontPatchELF = true;
+  dontRewriteSymlinks = true;
+
   installPhase = ''
     runHook preInstall
     patchShebangs install.sh
     mkdir -p $out/share/icons
     name= ./install.sh -d $out/share/icons
+    jdupes -l -r $out/share/icons
     runHook postInstall
   '';
 
-- 
cgit 1.4.1