Merge pull request #177961 from oxalica/fix/swayidle-exec

swayidle: fix the path to `sh`
main
Sandro 2 years ago committed by GitHub
commit a2b7340300
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      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";

Loading…
Cancel
Save