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.

1 files changed, 6 insertions, 8 deletions

diff --git a/pkgs/data/themes/catppuccin-gtk/default.nix b/pkgs/data/themes/catppuccin-gtk/default.nix
index b9bc042dd09..4158d4384d4 100644
--- a/pkgs/data/themes/catppuccin-gtk/default.nix
+++ b/pkgs/data/themes/catppuccin-gtk/default.nix
@@ -5,7 +5,6 @@
 , gnome-themes-extra
 , gtk-engine-murrine
 , sassc
-, which
 , tweaks ? [ ]
 , size ? "standard"
 }:
@@ -14,9 +13,9 @@ let
   validTweaks = [ "nord" "dracula" "black" "rimless" "normal" ];
 
   unknownTweaks = lib.subtractLists validTweaks tweaks;
-  illegalMix = !(lib.elem "nord" tweaks) && !(lib.elem "dracula" tweaks);
+  illegalMix = (lib.elem "nord" tweaks) && (lib.elem "dracula" tweaks);
 
-  assertIllegal = lib.assertMsg illegalMix ''
+  assertIllegal = lib.assertMsg (!illegalMix) ''
     Tweaks "nord" and "dracula" cannot be mixed. Tweaks: ${toString tweaks}
   '';
 
@@ -37,16 +36,16 @@ assert assertUnknown;
 
 stdenvNoCC.mkDerivation rec {
   pname = "catppuccin-gtk";
-  version = "unstable-2022-08-01";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     repo = "gtk";
     owner = "catppuccin";
-    rev = "87a79fd2bf07accc694455df30a32a82b1b31f4f";
-    sha256 = "sha256-dKHTQva0BYkO6VPNfY/pzRn/V1ghX+tYqbnM9hTAMeE=";
+    rev = "v-${version}";
+    sha256 = "sha256-oTAfURHMWqlKHk4CNz5cn6vO/7GmQJM2rXXGDz2e+0w=";
   };
 
-  nativeBuildInputs = [ gtk3 sassc which ];
+  nativeBuildInputs = [ gtk3 sassc ];
 
   buildInputs = [ gnome-themes-extra ];
 
@@ -61,7 +60,6 @@ stdenvNoCC.mkDerivation rec {
 
     export HOME=$(mktemp -d)
 
-    mkdir -p $out/share/themes
     bash install.sh -d $out/share/themes -t all \
       ${lib.optionalString (size != "") "-s ${size}"} \
       ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks}