summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-07-16 00:01:36 +0000
committerGitHub <noreply@github.com>2021-07-16 00:01:36 +0000
commitfa7a791586b5291f93de5026d97021fd16f3461e (patch)
treef6594faf08251da78715fbba49e4f969e7be7141 /pkgs/data
parent2ccf7ae45ce2efe48f207625d3db71149f7ac41b (diff)
parent53079ed913181b2f945cf1580746828b57d47edb (diff)
downloadnixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar.gz
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar.bz2
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar.lz
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar.xz
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.tar.zst
nixpkgs-fa7a791586b5291f93de5026d97021fd16f3461e.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/icons/qogir-icon-theme/default.nix17
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix
index e647b02f010..00de4f6760c 100644
--- a/pkgs/data/icons/qogir-icon-theme/default.nix
+++ b/pkgs/data/icons/qogir-icon-theme/default.nix
@@ -1,32 +1,39 @@
-{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme, jdupes }:
 
 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 ];
+  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
   '';
 
   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 ];
   };