Merge pull request #145941 from romildo/upd.moka-icon-theme

1 files changed, 16 insertions, 6 deletions

diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix
index 5e67fdc9cc934..04e1bce127509 100644
--- a/pkgs/data/icons/moka-icon-theme/default.nix
+++ b/pkgs/data/icons/moka-icon-theme/default.nix
@@ -1,14 +1,14 @@
-{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }:
+{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme, jdupes }:
 
 stdenv.mkDerivation rec {
   pname = "moka-icon-theme";
-  version = "5.4.0";
+  version = "unstable-2019-05-29";
 
   src = fetchFromGitHub {
     owner = "snwh";
     repo = pname;
-    rev = "v${version}";
-    sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd";
+    rev = "c0355ea31e5cfdb6b44d8108f602d66817546a09";
+    sha256 = "0m4kfarkl94wdhsds2q1l9x5hfa9l3117l8j6j7qm7sf7yzr90c8";
   };
 
   nativeBuildInputs = [
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
     ninja
     gtk3
     python3
+    jdupes
   ];
 
   propagatedBuildInputs = [
@@ -25,14 +26,23 @@ stdenv.mkDerivation rec {
 
   dontDropIconThemeCache = true;
 
+  # These fixup steps are slow and unnecessary for this package
+  dontPatchELF = true;
+  dontRewriteSymlinks = true;
+
   postPatch = ''
     patchShebangs meson/post_install.py
   '';
 
+  postInstall = ''
+    # replace duplicate files with symlinks
+    jdupes -l -r $out/share/icons
+  '';
+
   meta = with lib; {
-    description = "An icon theme designed with a minimal flat style using simple geometry and bright colours";
+    description = "Icon theme designed with a minimal flat style using simple geometry and bright colours";
     homepage = "https://snwh.org/moka";
-    license = with licenses; [ cc-by-sa-40 gpl3 ];
+    license = with licenses; [ cc-by-sa-40 gpl3Only ];
     # darwin cannot deal with file names differing only in case
     platforms = platforms.linux;
     maintainers = with maintainers; [ romildo ];