diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2023-12-31 11:29:59 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-31 11:29:59 -0300 |
| commit | 239bc23d1223f44744fe6a52d9535c05b152ca70 (patch) | |
| tree | 5b0422e2cc66d28abe808d46502fc35df9913e72 /pkgs/data/themes | |
| parent | 39d389848af626a11592d4d3a509c2b55b113f42 (diff) | |
| parent | a30b8e10112766461a0359ed6606b1ad79de7c22 (diff) | |
| download | nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar.gz nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar.bz2 nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar.lz nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar.xz nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.tar.zst nixlib-239bc23d1223f44744fe6a52d9535c05b152ca70.zip | |
Merge pull request #276528 from romildo/upd.colloid-kde
colloid-kde: make sddm a separate output
Diffstat (limited to 'pkgs/data/themes')
| -rw-r--r-- | pkgs/data/themes/colloid-kde/default.nix | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/pkgs/data/themes/colloid-kde/default.nix b/pkgs/data/themes/colloid-kde/default.nix index 24cde3f38989..5393c54f7c33 100644 --- a/pkgs/data/themes/colloid-kde/default.nix +++ b/pkgs/data/themes/colloid-kde/default.nix @@ -18,13 +18,7 @@ stdenvNoCC.mkDerivation rec { 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 - ]; + outputs = [ "out" "sddm" ]; postPatch = '' patchShebangs install.sh @@ -34,12 +28,12 @@ stdenvNoCC.mkDerivation rec { --replace '$HOME/.config' $out/share substituteInPlace sddm/install.sh \ - --replace /usr $out \ + --replace /usr $sddm \ --replace '$(cd $(dirname $0) && pwd)' . \ --replace '"$UID" -eq "$ROOT_UID"' true substituteInPlace sddm/Colloid/Main.qml \ - --replace /usr $out + --replace /usr $sddm ''; installPhase = '' @@ -50,13 +44,23 @@ stdenvNoCC.mkDerivation rec { name= HOME="$TMPDIR" \ ./install.sh --dest $out/share/themes - mkdir -p $out/share/sddm/themes + mkdir -p $sddm/share/sddm/themes cd sddm source install.sh runHook postInstall ''; + postFixup = '' + # Propagate sddm theme dependencies to user env otherwise sddm + # does not find them. Putting them in buildInputs is not enough. + + mkdir -p $sddm/nix-support + + printWords ${kdeclarative.bin} ${plasma-framework} ${plasma-workspace} \ + >> $sddm/nix-support/propagated-user-env-packages + ''; + passthru.updateScript = gitUpdater { }; meta = with lib; { |