1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

uwsm: also wrap sway and hyprland's paths

Remove this when it's not needed anymore
This commit is contained in:
John Titor 2024-07-29 19:06:20 +05:30
parent 6317528b1a
commit 2c60d67129
No known key found for this signature in database
GPG key ID: 29B0514F4E3C1CC0

View file

@ -14,9 +14,13 @@
newt, newt,
python3Packages, python3Packages,
util-linux, util-linux,
hyprland,
sway,
fumonSupport ? true, fumonSupport ? true,
uuctlSupport ? true, uuctlSupport ? true,
uwsmAppSupport ? true, uwsmAppSupport ? true,
hyprlandSupport ? false,
swaySupport ? false,
}: }:
let let
python = python3Packages.python.withPackages (ps: [ python = python3Packages.python.withPackages (ps: [
@ -66,14 +70,31 @@ stdenv.mkDerivation (finalAttrs: {
updateScript = nix-update-script { }; updateScript = nix-update-script { };
}; };
postInstall = '' postInstall =
wrapProgram $out/bin/uwsm \ let
--prefix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs} wrapperArgs = ''
${lib.optionalString uuctlSupport '' --prefix PATH : "${lib.makeBinPath finalAttrs.propagatedBuildInputs}" \
wrapProgram $out/bin/uuctl \ --suffix PATH : "${
--prefix PATH : ${lib.makeBinPath finalAttrs.propagatedBuildInputs} lib.makeBinPath (
''} # uwsm as of 0.17.2 can load WMs like sway and hyprland by path
''; # but this is still needed as a fallback
lib.optionals hyprlandSupport [ hyprland ] ++ lib.optionals swaySupport [ sway ]
)
}"
'';
in
''
wrapProgram $out/bin/uwsm ${wrapperArgs}
${lib.optionalString uuctlSupport ''
wrapProgram $out/bin/uuctl ${wrapperArgs}
''}
${lib.optionalString uwsmAppSupport ''
wrapProgram $out/bin/uwsm-app ${wrapperArgs}
''}
${lib.optionalString fumonSupport ''
wrapProgram $out/bin/fumon ${wrapperArgs}
''}
'';
meta = { meta = {
description = "Universal wayland session manager"; description = "Universal wayland session manager";