From 2edb7f2edbe1d843ffc706ed49b9bb9e6a6dad28 Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Fri, 3 Nov 2023 16:12:45 -0300
Subject: whitesur-kde: unstable-2023-08-15 -> unstable-2023-10-06

---
 pkgs/data/themes/whitesur-kde/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/data/themes')

diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index 2e98b4165c07..e392e4286b66 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "whitesur-kde";
-  version = "unstable-2023-08-15";
+  version = "unstable-2023-10-06";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = finalAttrs.pname;
-    rev = "d50bc20b2b78705bb9856204066affb763fa8a35";
-    hash = "sha256-oG6QT4VQpBznM+gvzdiY4CldOwdHcBeHlbvlc52eFuU=";
+    rev = "2b4bcc76168bd8a4a7601188e177fa0ab485cdc8";
+    hash = "sha256-+Iooj8a7zfLhEWnjLEVoe/ebD9Vew5HZdz0wpWVZxA8=";
   };
 
   postPatch = ''
-- 
cgit 1.4.1


From 2ff27bb7a11e59f850a520dedd9649b6ff1d2b03 Mon Sep 17 00:00:00 2001
From: José Romildo <malaquias@gmail.com>
Date: Fri, 3 Nov 2023 16:06:52 -0300
Subject: whitesur-kde: propagate sddm theme dependencies to user env

---
 pkgs/data/themes/whitesur-kde/default.nix | 14 ++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'pkgs/data/themes')

diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index e392e4286b66..20dc5a66fe5e 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -1,6 +1,9 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
+, kdeclarative
+, plasma-framework
+, plasma-workspace
 , gitUpdater
 }:
 
@@ -15,6 +18,14 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     hash = "sha256-+Iooj8a7zfLhEWnjLEVoe/ebD9Vew5HZdz0wpWVZxA8=";
   };
 
+  # Propagate sddm theme dependencies to user env otherwise sddm does
+  # not find them. Putting them in buildInputs is not enough.
+  propagatedUserEnvPkgs = [
+    kdeclarative.bin
+    plasma-framework
+    plasma-workspace
+  ];
+
   postPatch = ''
     patchShebangs install.sh
 
@@ -22,6 +33,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --replace '$HOME/.config' $out/share \
       --replace '$HOME/.local' $out \
       --replace '"$HOME"/.Xresources' $out/doc/.Xresources
+
+    substituteInPlace sddm/*/Main.qml \
+      --replace /usr $out
   '';
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b8667f8be2cc..b422f3b0fb91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -30213,7 +30213,9 @@ with pkgs;
 
   whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
 
-  whitesur-kde = callPackage ../data/themes/whitesur-kde { };
+  whitesur-kde = callPackage ../data/themes/whitesur-kde {
+    inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
+  };
 
   wireless-regdb = callPackage ../data/misc/wireless-regdb { };
 
-- 
cgit 1.4.1