diff options
| author | oxalica <oxalicc@pm.me> | 2022-06-17 06:40:49 +0800 |
|---|---|---|
| committer | oxalica <oxalicc@pm.me> | 2022-06-17 11:06:37 +0800 |
| commit | a77271aae717e8813097e1c5469ee2de1d96a083 (patch) | |
| tree | 76021f47b9d1b1691ed905550689a6b9c237b1a2 /pkgs/applications/window-managers/sway/idle.nix | |
| parent | b1957596ff1c7aa8c55c4512b7ad1c9672502e8e (diff) | |
| download | nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar.gz nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar.bz2 nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar.lz nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar.xz nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.tar.zst nixpkgs-a77271aae717e8813097e1c5469ee2de1d96a083.zip | |
swayidle: fix the path to `sh`
The execvp to the bare `sh` would fail when PATH is cleared, eg. in a systemd unit.
Diffstat (limited to 'pkgs/applications/window-managers/sway/idle.nix')
| -rw-r--r-- | pkgs/applications/window-managers/sway/idle.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index 4b2909eac21..97e3febc7b9 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , meson, ninja, pkg-config, scdoc, wayland-scanner -, wayland, wayland-protocols +, wayland, wayland-protocols, runtimeShell , systemdSupport ? stdenv.isLinux, systemd }: @@ -22,7 +22,13 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dman-pages=enabled" "-Dlogind=${if systemdSupport then "enabled" else "disabled"}" ]; - postPatch = "substituteInPlace main.c --replace '%lu' '%zu'"; + # Remove the `%zu` patch for the next release after 1.7.1. + # https://github.com/swaywm/swayidle/commit/e81d40fca7533f73319e76e42fa9694b21cc9e6e + postPatch = '' + substituteInPlace main.c \ + --replace '%lu' '%zu' \ + --replace '"sh"' '"${runtimeShell}"' + ''; meta = with lib; { description = "Idle management daemon for Wayland"; |