diff options
Diffstat (limited to 'pkgs/by-name/sw/sway/package.nix')
| -rw-r--r-- | pkgs/by-name/sw/sway/package.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/by-name/sw/sway/package.nix b/pkgs/by-name/sw/sway/package.nix index 3e9ed51613f82..2ae6d3ed01546 100644 --- a/pkgs/by-name/sw/sway/package.nix +++ b/pkgs/by-name/sw/sway/package.nix @@ -13,9 +13,12 @@ assert extraSessionCommands != "" -> withBaseWrapper; -with lib; - let + inherit (builtins) replaceStrings; + inherit (lib.lists) optional optionals; + inherit (lib.meta) getExe; + inherit (lib.strings) concatMapStrings optionalString; + sway = sway-unwrapped.overrideAttrs (oa: { inherit isNixOS enableXWayland; }); baseWrapper = writeShellScriptBin sway.meta.mainProgram '' set -o errexit @@ -26,13 +29,13 @@ let fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS - exec ${lib.getExe sway} "$@" + exec ${getExe sway} "$@" else - exec ${lib.optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${lib.getExe sway} "$@" + exec ${optionalString dbusSupport "${dbus}/bin/dbus-run-session"} ${getExe sway} "$@" fi ''; in symlinkJoin rec { - pname = lib.replaceStrings ["-unwrapped"] [""] sway.pname; + pname = replaceStrings ["-unwrapped"] [""] sway.pname; inherit (sway) version; name = "${pname}-${version}"; |