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

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

authored by

José Romildo Malaquias and committed by
GitHub
2c8d4198 dd509de2

+29 -8
+26 -7
pkgs/data/themes/graphite-kde-theme/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 + , kdeclarative 5 + , plasma-framework 6 + , plasma-workspace 7 + , gitUpdater 4 8 }: 5 9 6 10 stdenv.mkDerivation rec { 7 11 pname = "graphite-kde-theme"; 8 - version = "2022-02-08"; 12 + version = "unstable-2023-10-25"; 9 13 10 14 src = fetchFromGitHub { 11 15 owner = "vinceliuice"; 12 16 repo = pname; 13 - rev = version; 14 - sha256 = "0pnn5s1vfdgkpsy5sc838731ly1imi8pbyd4asibw4zi238l0nvf"; 17 + rev = "33cc85c49c424dfcba73e6ee84b0dc7fb9e52566"; 18 + hash = "sha256-iQGT2x0wY2EIuYw/a1MB8rT9BxiqWrOyBo6EGIJwsFw="; 15 19 }; 16 20 17 - installPhase = '' 18 - runHook preInstall 21 + # Propagate sddm theme dependencies to user env otherwise sddm does 22 + # not find them. Putting them in buildInputs is not enough. 23 + propagatedUserEnvPkgs = [ 24 + kdeclarative.bin 25 + plasma-framework 26 + plasma-workspace 27 + ]; 19 28 29 + postPatch = '' 20 30 patchShebangs install.sh 21 31 22 32 substituteInPlace install.sh \ 23 33 --replace '$HOME/.local' $out \ 24 34 --replace '$HOME/.config' $out/share 25 35 26 - name= ./install.sh --dest $out/share/themes 36 + substituteInPlace sddm/*/Main.qml \ 37 + --replace /usr $out 38 + ''; 39 + 40 + installPhase = '' 41 + runHook preInstall 42 + 43 + name= ./install.sh 27 44 28 45 mkdir -p $out/share/sddm/themes 29 - cp -a sddm/Graphite $out/share/sddm/themes/ 46 + cp -a sddm/Graphite* $out/share/sddm/themes/ 30 47 31 48 runHook postInstall 32 49 ''; 50 + 51 + passthru.updateScript = gitUpdater { }; 33 52 34 53 meta = with lib; { 35 54 description = "A flat Design theme for KDE Plasma desktop";
+3 -1
pkgs/top-level/all-packages.nix
··· 29373 29373 29374 29374 graphite-gtk-theme = callPackage ../data/themes/graphite-gtk-theme { }; 29375 29375 29376 - graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { }; 29376 + graphite-kde-theme = callPackage ../data/themes/graphite-kde-theme { 29377 + inherit (libsForQt5) kdeclarative plasma-framework plasma-workspace; 29378 + }; 29377 29379 29378 29380 greybird = callPackage ../data/themes/greybird { }; 29379 29381