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