about summary refs log tree commit diff
path: root/pkgs/data
diff options
context:
space:
mode:
authorJosé Romildo Malaquias <malaquias@gmail.com>2023-11-22 07:19:16 -0300
committerGitHub <noreply@github.com>2023-11-22 07:19:16 -0300
commitf8baac2255e6bb135091fcb6f29f806a20e1567e (patch)
tree3c40b173b40fd5b00917683a7ae9f9a50ae656af /pkgs/data
parentc2e8d99887455a22ba5a0987d4f6166fb1d3cd36 (diff)
parent2ff27bb7a11e59f850a520dedd9649b6ff1d2b03 (diff)
downloadnixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar.gz
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar.bz2
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar.lz
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar.xz
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.tar.zst
nixlib-f8baac2255e6bb135091fcb6f29f806a20e1567e.zip
Merge pull request #265297 from romildo/upd.whitesur-kde
whitesur-kde: unstable-2023-08-15 -> unstable-2023-10-06
Diffstat (limited to 'pkgs/data')
-rw-r--r--pkgs/data/themes/whitesur-kde/default.nix20
1 files changed, 17 insertions, 3 deletions
diff --git a/pkgs/data/themes/whitesur-kde/default.nix b/pkgs/data/themes/whitesur-kde/default.nix
index 2e98b4165c07..20dc5a66fe5e 100644
--- a/pkgs/data/themes/whitesur-kde/default.nix
+++ b/pkgs/data/themes/whitesur-kde/default.nix
@@ -1,20 +1,31 @@
 { lib
 , stdenvNoCC
 , fetchFromGitHub
+, kdeclarative
+, plasma-framework
+, plasma-workspace
 , gitUpdater
 }:
 
 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=";
   };
 
+  # 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 = ''