diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2023-11-22 07:15:25 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-22 07:15:25 -0300 |
| commit | dd509de23e8c2e214ff35cb3a447c42c7a0fe4aa (patch) | |
| tree | 85f3da9c0eaa1fd6fae6560537ba60b713330c44 /pkgs/data | |
| parent | 480f5b14e31427b2e2498a093c99cfd6cd35bce5 (diff) | |
| parent | e2334f95f7d4f828b2ff60f56a973c04211e7029 (diff) | |
Merge pull request #264413 from romildo/upd.colloid-kde
colloid-kde: unstable-2022-07-13 -> unstable-2023-07-04
Diffstat (limited to 'pkgs/data')
| -rw-r--r-- | pkgs/data/themes/colloid-kde/default.nix | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index 8c2dcb8a8738a..24cde3f38989d 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -1,26 +1,45 @@ { lib , stdenvNoCC , fetchFromGitHub +, kdeclarative +, plasma-framework +, plasma-workspace , gitUpdater }: stdenvNoCC.mkDerivation rec { pname = "colloid-kde"; - version = "unstable-2022-07-13"; + version = "unstable-2023-07-04"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; - rev = "eaf6844e997aa60c755af7ea560ffba798e72ff5"; - hash = "sha256-FNTG5aVvTWHqNVVR23LFG/ykPtXRD7oH5C6eyWaqc60="; + rev = "0b79befdad9b442b5a8287342c4b7e47ff87d555"; + hash = "sha256-AYH9fW20/p+mq6lxR1lcCV1BQ/kgcsjHncpMvYWXnWA="; }; + # 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 + + substituteInPlace sddm/install.sh \ + --replace /usr $out \ + --replace '$(cd $(dirname $0) && pwd)' . \ + --replace '"$UID" -eq "$ROOT_UID"' true + + substituteInPlace sddm/Colloid/Main.qml \ + --replace /usr $out ''; installPhase = '' @@ -31,6 +50,10 @@ stdenvNoCC.mkDerivation rec { name= HOME="$TMPDIR" \ ./install.sh --dest $out/share/themes + mkdir -p $out/share/sddm/themes + cd sddm + source install.sh + runHook postInstall ''; |