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 = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a49fcec77a81..0031ff1a5ec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30215,7 +30215,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 { };