diff options
| -rw-r--r-- | pkgs/data/themes/graphite-kde-theme/default.nix | 33 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 29 insertions, 8 deletions
diff --git a/pkgs/data/themes/graphite-kde-theme/default.nix b/pkgs/data/themes/graphite-kde-theme/default.nix index dd3a215a0385..d098cf6aab45 100644 --- a/pkgs/data/themes/graphite-kde-theme/default.nix +++ b/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; - sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; + rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566"; + hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw="; }; - installPhase = '' - runHook preInstall + # 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 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4cceaa582a67..98e699d6d150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; |