diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index a8eb1a8736d6..fc541f6e5b72 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome, gnome-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, gtk3, gnome, gnome-icon-theme, hicolor-icon-theme, jdupes }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; - version = "2018-06-24"; + version = "unstable-2020-03-12"; src = fetchFromGitHub { owner = "snwh"; repo = pname; - rev = "c7cd013fba06dd8fd5cdff9f885520e2923266b8"; - sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; + rev = "aa3e8af7a1f0831a51fd7e638a4acb077a1e5188"; + sha256 = "0x6qzch4rrc8firb1dcf926j93gpqxvd7h6dj5wwczxbvxi5bd77"; }; nativeBuildInputs = [ meson ninja gtk3 - python3 + jdupes ]; propagatedBuildInputs = [ @@ -26,13 +26,16 @@ stdenv.mkDerivation rec { dontDropIconThemeCache = true; - postPatch = '' - patchShebangs meson/post_install.py - ''; + # These fixup steps are slow and unnecessary for this package + dontPatchELF = true; + dontRewriteSymlinks = true; postInstall = '' # The cache for Paper-Mono-Dark is missing gtk-update-icon-cache "$out"/share/icons/Paper-Mono-Dark; + + # replace duplicate files with symlinks + jdupes -l -r $out/share/icons ''; meta = with lib; {