whitesur-kde: unstable-2023-10-06 -> 2022-05-01-unstable-2024-08-07

pkgs/data/themes/whitesur-kde/default.nix

@@ -1,52 +1,54 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
-, kdeclarative
-, plasma-framework
-, plasma-workspace
+, plasma-desktop
+, qtsvg
 , unstableGitUpdater
 }:
 
 stdenvNoCC.mkDerivation {
   pname = "whitesur-kde";
-  version = "unstable-2023-10-06";
+  version = "2022-05-01-unstable-2024-08-07";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = "whitesur-kde";
-    rev = "2b4bcc76168bd8a4a7601188e177fa0ab485cdc8";
-    hash = "sha256-+Iooj8a7zfLhEWnjLEVoe/ebD9Vew5HZdz0wpWVZxA8=";
+    rev = "a5c704224069a9e10fce82eec3c4ba482924d7ef";
+    hash = "sha256-GGrddhmYOp2qm1rHyBnSjQIyw0pU7CNJhxUt6da8ZpQ=";
   };
 
   # 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
+    plasma-desktop
+    qtsvg
   ];
 
   postPatch = ''
-    patchShebangs install.sh
+    patchShebangs install.sh sddm/install.sh
 
     substituteInPlace install.sh \
-      --replace '$HOME/.config' $out/share \
-      --replace '$HOME/.local' $out \
-      --replace '"$HOME"/.Xresources' $out/doc/.Xresources
+      --replace-fail '[ "$UID" -eq "$ROOT_UID" ]' true \
+      --replace-fail /usr $out \
+      --replace-fail '"$HOME"/.Xresources' $out/doc/.Xresources
+
+    substituteInPlace sddm/install.sh \
+      --replace-fail '[ "$UID" -eq "$ROOT_UID" ]' true \
+      --replace-fail /usr $out \
+      --replace-fail 'REO_DIR="$(cd $(dirname $0) && pwd)"' 'REO_DIR=sddm'
 
     substituteInPlace sddm/*/Main.qml \
-      --replace /usr $out
+      --replace-fail /usr $out
   '';
 
   installPhase = ''
     runHook preInstall
 
     mkdir -p $out/doc
-
     name= ./install.sh
 
     mkdir -p $out/share/sddm/themes
-    cp -a sddm/WhiteSur $out/share/sddm/themes/
+    sddm/install.sh
 
     runHook postInstall
   '';

pkgs/top-level/all-packages.nix

@@ -28651,7 +28651,7 @@ with pkgs;
 
   whitesur-icon-theme = callPackage ../data/icons/whitesur-icon-theme { };
 
-  whitesur-kde = libsForQt5.callPackage ../data/themes/whitesur-kde { };
+  whitesur-kde = kdePackages.callPackage ../data/themes/whitesur-kde { };
 
   wireless-regdb = callPackage ../data/misc/wireless-regdb { };