diff --git a/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix b/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix index be452d0de4d8..24cc66cda7ec 100644 --- a/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix +++ b/pkgs/by-name/ca/catppuccin-papirus-folders/package.nix @@ -2,7 +2,9 @@ stdenvNoCC, lib, fetchFromGitHub, + fetchurl, gtk3, + getent, papirus-icon-theme, flavor ? "mocha", accent ? "blue", @@ -31,27 +33,42 @@ let "mocha" ]; pname = "catppuccin-papirus-folders"; + + # Fetch the papirus-folders script from upstream + # Per instructions in the papirus-folders project. + papirus-folders-rev = "0f838ee5679229e3a3e97e3b333c222c9e9615b4"; + papirus-folders-script = fetchurl { + url = "https://raw.githubusercontent.com/PapirusDevelopmentTeam/papirus-folders/${papirus-folders-rev}/papirus-folders"; + sha256 = "sha256-NJpXdf1ymnvQzRwUl3OalLzs3sXWVFTp5jN2B3vtUk0="; + executable = true; + }; in lib.checkListOfEnum "${pname}: accent colors" validAccents [ accent ] lib.checkListOfEnum "${pname}: flavors" validFlavors [ flavor ] - stdenvNoCC.mkDerivation { inherit pname; - version = "0-unstable-2023-08-02"; + version = "0-unstable-2024-08-06"; src = fetchFromGitHub { owner = "catppuccin"; repo = "papirus-folders"; - rev = "fcf96737fffc343a1bf129732c37d19f2d77fa5c"; - sha256 = "sha256-3yjIGzN+/moP2OVGDIAy4zPqUroSjx3c2mJjdZGhTsY="; + rev = "f83671d17ea67e335b34f8028a7e6d78bca735d7"; + sha256 = "sha256-FiZdwzsaMhS+5EYTcVU1LVax2H1FidQw97xZklNH2R4="; }; - nativeBuildInputs = [ gtk3 ]; + # This takes a horribly long time, and there's nothing to fixup in + # this package. + dontFixup = true; + nativeBuildInputs = [ + gtk3 + getent + ]; postPatch = '' + cp ${papirus-folders-script} ./papirus-folders patchShebangs ./papirus-folders '';