Merge pull request #264422 from romildo/upd.graphite-kde-theme

graphite-kde-theme: 2022-02-08 -> unstable-2023-10-25

pkgs/data/themes/graphite-kde-theme/default.nix

@@ -1,36 +1,55 @@
 { stdenv
 , lib
 , fetchFromGitHub
+, kdeclarative
+, plasma-framework
+, plasma-workspace
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "graphite-kde-theme";
-  version = "2022-02-08";
+  version = "unstable-2023-10-25";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = version;
+    rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566";
-    sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf";
+    hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw=";
   };
 
-  installPhase = ''
+  # Propagate sddm theme dependencies to user env otherwise sddm does
-    runHook preInstall
+  # not find them. Putting them in buildInputs is not enough.
+  propagatedUserEnvPkgs = [
+    kdeclarative.bin
+    plasma-framework
+    plasma-workspace
+  ];
 
+  postPatch = ''
     patchShebangs install.sh
 
     substituteInPlace install.sh \
       --replace '$HOME/.local' $out \
       --replace '$HOME/.config' $out/share
 
-    name= ./install.sh --dest $out/share/themes
+    substituteInPlace sddm/*/Main.qml \
+      --replace /usr $out
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    name= ./install.sh
 
     mkdir -p $out/share/sddm/themes
-    cp -a sddm/Graphite $out/share/sddm/themes/
+    cp -a sddm/Graphite* $out/share/sddm/themes/
 
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     description = "A flat Design theme for KDE Plasma desktop";
     homepage = "https://github.com/vinceliuice/Graphite-kde-theme";

pkgs/top-level/all-packages.nix

@@ -29373,7 +29373,9 @@ with pkgs;
 
   graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { };
 
-  graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { };
+  graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme {
+    inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace;
+  };
 
   greybird = callPackage ../data/themes/greybird { };