diff options
| author | Emil Karlson <jekarlson@gmail.com> | 2022-12-02 09:44:13 +0200 |
|---|---|---|
| committer | Rick van Schijndel <Mindavi@users.noreply.github.com> | 2022-12-09 08:32:09 +0100 |
| commit | d71de0eca966a531eb46469ccb527fa2429f75ed (patch) | |
| tree | c1eef8606163642993a6de63261530f92f402eee /pkgs/os-specific/linux/psmisc | |
| parent | 9e4a15be2c56ef710392d3464ce68b298fcafe84 (diff) | |
psmisc: fall back to kill when pidfd_send_signal fails
Diffstat (limited to 'pkgs/os-specific/linux/psmisc')
| -rw-r--r-- | pkgs/os-specific/linux/psmisc/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index e2f0fe59a075c..092c75a5837d7 100644 --- a/pkgs/os-specific/linux/psmisc/default.nix +++ b/pkgs/os-specific/linux/psmisc/default.nix @@ -1,4 +1,4 @@ -{lib, stdenv, fetchFromGitLab, autoconf, automake, gettext, ncurses}: +{lib, stdenv, fetchFromGitLab, fetchpatch, autoconf, automake, gettext, ncurses}: stdenv.mkDerivation rec { pname = "psmisc"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-02jvRPqN8DS30ID42hQFu400NoFC5QiH5YA3NB+EoFI="; }; + patches = [ + # Upstream patch to be released in the next version + (fetchpatch { + name = "fallback-to-kill.diff"; + url = "https://gitlab.com/psmisc/psmisc/-/commit/6892e321e7042e3df60a5501a1c59d076e8a856f.patch"; + sha256 = "sha256-3uk1KXEOqAxpHWBORUw5+dR5s/Z55JJs5tuBZlTdjlo="; + excludes = [ "ChangeLog" ]; + }) + ]; + nativeBuildInputs = [ autoconf automake gettext ]; buildInputs = [ ncurses ]; |