diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-04-20 23:06:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-20 23:06:06 +0200 |
commit | 20e0c45c7ae458bf84946d97e806fcd1d70de1d0 (patch) | |
tree | fb0a5824ef6e0ad75c7745547341e196ca95bb79 /pkgs/os-specific | |
parent | f6e091399a805c45a4f9d6647dc0dd9ffca29c61 (diff) | |
parent | d36daf07d634559459d15b17a26706cf59c7badb (diff) |
Merge pull request #304527 from atorres1985-contrib/earlyoom
earlyoom: 1.7 -> 1.8
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/earlyoom/default.nix | 38 | ||||
-rw-r--r-- | pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch | 11 |
2 files changed, 0 insertions, 49 deletions
diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/os-specific/linux/earlyoom/default.nix deleted file mode 100644 index d1d95b4d3f959..0000000000000 --- a/pkgs/os-specific/linux/earlyoom/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false, nixosTests }: - -stdenv.mkDerivation rec { - pname = "earlyoom"; - version = "1.7"; - - src = fetchFromGitHub { - owner = "rfjakob"; - repo = "earlyoom"; - rev = "v${version}"; - sha256 = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; - }; - - nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; - - patches = [ ./fix-dbus-path.patch ]; - - makeFlags = [ "VERSION=${version}" ]; - - installPhase = '' - install -D earlyoom $out/bin/earlyoom - '' + lib.optionalString withManpage '' - installManPage earlyoom.1 - ''; - - passthru.tests = { - inherit (nixosTests) earlyoom; - }; - - meta = with lib; { - description = "Early OOM Daemon for Linux"; - mainProgram = "earlyoom"; - homepage = "https://github.com/rfjakob/earlyoom"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; []; - }; -} diff --git a/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch b/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch deleted file mode 100644 index e1c10cf82f96e..0000000000000 --- a/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/kill.c -+++ b/kill.c -@@ -55,7 +55,7 @@ static void notify(const char* summary, const char* body) - } - // Complete command line looks like this: - // dbus-send --system / net.nuetzlich.SystemNotifications.Notify 'string:summary text' 'string:and body text' -- execl("/usr/bin/dbus-send", "dbus-send", "--system", "/", "net.nuetzlich.SystemNotifications.Notify", -+ execlp("dbus-send", "dbus-send", "--system", "/", "net.nuetzlich.SystemNotifications.Notify", - summary2, body2, NULL); - warn("notify: exec failed: %s\n", strerror(errno)); - exit(1); |