From 486288a59263d7c61e6a7d95d9ed4ebf9b4c615f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 30 Oct 2024 14:33:52 -0300
Subject: [PATCH] whitesur-gtk-theme: 2024-05-01 -> 2024.09.02

---
 pkgs/data/themes/whitesur/default.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/data/themes/whitesur/default.nix b/pkgs/data/themes/whitesur/default.nix
index 6909db147de3..82b30082d1e1 100644
--- a/pkgs/data/themes/whitesur/default.nix
+++ b/pkgs/data/themes/whitesur/default.nix
@@ -2,8 +2,8 @@
 , stdenv
 , fetchFromGitHub
 , gitUpdater
+, dialog
 , glib
-, gnome-shell
 , gnome-themes-extra
 , jdupes
 , libxml2
@@ -32,7 +32,7 @@ lib.checkListOfEnum "${pname}: alt variants" [ "normal" "alt" "all" ] altVariant
 lib.checkListOfEnum "${pname}: color variants" [ "Light" "Dark" ] colorVariants
 lib.checkListOfEnum "${pname}: opacity variants" [ "normal" "solid" ] opacityVariants
 lib.checkListOfEnum "${pname}: theme variants" [ "default" "blue" "purple" "pink" "red" "orange" "yellow" "green" "grey" "all" ] themeVariants
-lib.checkListOfEnum "${pname}: Activities icon variants" [ "standard" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
+lib.checkListOfEnum "${pname}: activities icon variants" [ "standard" "apple" "simple" "gnome" "ubuntu" "tux" "arch" "manjaro" "fedora" "debian" "void" "opensuse" "popos" "mxlinux" "zorin" "budgie" "gentoo" ] (single iconVariant)
 lib.checkListOfEnum "${pname}: nautilus style" [ "stable" "normal" "mojave" "glassy" ] (single nautilusStyle)
 lib.checkListOfEnum "${pname}: nautilus sidebar minimum width" [ "default" "180" "220" "240" "260" "280" ] (single nautilusSize)
 lib.checkListOfEnum "${pname}: panel opacity" [ "default" "30" "45" "60" "75" ] (single panelOpacity)
@@ -40,18 +40,18 @@ lib.checkListOfEnum "${pname}: panel size" [ "default" "smaller" "bigger" ] (sin
 
 stdenv.mkDerivation rec {
   pname = "whitesur-gtk-theme";
-  version = "2024-05-01";
+  version = "2024.09.02";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
     rev = version;
-    sha256 = "sha256-NgmFQtgVJvVXJjZUXt/BIx1hdzjHfVmmwXUCDZZD7+g=";
+    hash = "sha256-a32iHPcbMYuBy65FWm/fkjwJQE3aVScR3WJJzKTVx9k=";
   };
 
   nativeBuildInputs = [
+    dialog
     glib
-    gnome-shell
     jdupes
     libxml2
     sassc
@@ -68,10 +68,10 @@ stdenv.mkDerivation rec {
     done
 
     # Do not provide `sudo`, as it is not needed in our use case of the install script
-    substituteInPlace shell/lib-core.sh --replace '$(which sudo)' false
+    substituteInPlace shell/lib-core.sh --replace-fail '$(which sudo)' false
 
     # Provides a dummy home directory
-    substituteInPlace shell/lib-core.sh --replace 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
+    substituteInPlace shell/lib-core.sh --replace-fail 'MY_HOME=$(getent passwd "''${MY_USERNAME}" | cut -d: -f6)' 'MY_HOME=/tmp'
   '';
 
   dontBuild = true;
@@ -81,19 +81,19 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/share/themes
 
-    ./install.sh  \
+    ./install.sh \
       ${toString (map (x: "--alt " + x) altVariants)} \
       ${toString (map (x: "--color " + x) colorVariants)} \
       ${toString (map (x: "--opacity " + x) opacityVariants)} \
       ${toString (map (x: "--theme " + x) themeVariants)} \
-      ${lib.optionalString (iconVariant != null) ("--icon " + iconVariant)} \
-      ${lib.optionalString (nautilusStyle != null) ("--nautilus-style " + nautilusStyle)} \
+      ${lib.optionalString (nautilusStyle != null) ("--nautilus " + nautilusStyle)} \
       ${lib.optionalString (nautilusSize != null) ("--size " + nautilusSize)} \
-      ${lib.optionalString (panelOpacity != null) ("--panel-opacity " + panelOpacity)} \
-      ${lib.optionalString (panelSize != null) ("--panel-size " + panelSize)} \
       ${lib.optionalString roundedMaxWindow "--roundedmaxwindow"} \
       ${lib.optionalString nordColor "--nordcolor"} \
       ${lib.optionalString darkerColor "--darkercolor"} \
+      ${lib.optionalString (iconVariant != null) ("--gnome-shell -i " + iconVariant)} \
+      ${lib.optionalString (panelSize != null) ("--gnome-shell -height " + panelSize)} \
+      ${lib.optionalString (panelOpacity != null) ("--gnome-shell -panelopacity " + panelOpacity)} \
       --dest $out/share/themes
 
     jdupes --quiet --link-soft --recurse $out/share