catppuccin-gtk: unstable-2022-08-01 -> 0.2.7

https://github.com/catppuccin/gtk/releases/tag/v-0.2.7

Fix logic for detecting incompatible tweaks.

kilianar 3ffcb4a7 da87f771

+6 -8
+6 -8
pkgs/data/themes/catppuccin-gtk/default.nix
··· 5 , gnome-themes-extra 6 , gtk-engine-murrine 7 , sassc 8 - , which 9 , tweaks ? [ ] 10 , size ? "standard" 11 }: ··· 14 validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ]; 15 16 unknownTweaks = lib.subtractLists validTweaks tweaks; 17 - illegalMix = !(lib.elem "nord" tweaks) && !(lib.elem "dracula" tweaks); 18 19 - assertIllegal = lib.assertMsg illegalMix '' 20 Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks} 21 ''; 22 ··· 37 38 stdenvNoCC.mkDerivation rec { 39 pname = "catppuccin-gtk"; 40 - version = "unstable-2022-08-01"; 41 42 src = fetchFromGitHub { 43 repo = "gtk"; 44 owner = "catppuccin"; 45 - rev = "87a79fd2bf07accc694455df30a32a82b1b31f4f"; 46 - sha256 = "sha256-dKHTQva0BYkO6VPNfY/pzRn/V1ghX+tYqbnM9hTAMeE="; 47 }; 48 49 - nativeBuildInputs = [ gtk3 sassc which ]; 50 51 buildInputs = [ gnome-themes-extra ]; 52 ··· 61 62 export HOME=$(mktemp -d) 63 64 - mkdir -p $out/share/themes 65 bash install.sh -d $out/share/themes -t all \ 66 ${lib.optionalString (size != "") "-s ${size}"} \ 67 ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks}
··· 5 , gnome-themes-extra 6 , gtk-engine-murrine 7 , sassc 8 , tweaks ? [ ] 9 , size ? "standard" 10 }: ··· 13 validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ]; 14 15 unknownTweaks = lib.subtractLists validTweaks tweaks; 16 + illegalMix = (lib.elem "nord" tweaks) && (lib.elem "dracula" tweaks); 17 18 + assertIllegal = lib.assertMsg (!illegalMix) '' 19 Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks} 20 ''; 21 ··· 36 37 stdenvNoCC.mkDerivation rec { 38 pname = "catppuccin-gtk"; 39 + version = "0.2.7"; 40 41 src = fetchFromGitHub { 42 repo = "gtk"; 43 owner = "catppuccin"; 44 + rev = "v-${version}"; 45 + sha256 = "sha256-oTAfURHMWqlKHk4CNz5cn6vO/7GmQJM2rXXGDz2e+0w="; 46 }; 47 48 + nativeBuildInputs = [ gtk3 sassc ]; 49 50 buildInputs = [ gnome-themes-extra ]; 51 ··· 60 61 export HOME=$(mktemp -d) 62 63 bash install.sh -d $out/share/themes -t all \ 64 ${lib.optionalString (size != "") "-s ${size}"} \ 65 ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks}