diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-09-25 16:29:34 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-09-25 16:29:49 +0100 |
| commit | 394521c7808098787fefd93102d60196ca9f8366 (patch) | |
| tree | 4646fa63839c8a33f64d4e6698d3f8cc849c53d6 /pkgs/tools/admin/chkservice | |
| parent | a1d85c0fca9079f359da0c07286113a35d7b6a8f (diff) | |
chkservice: pull fix for gcc-11
Without the change build fails on gcc-11 as:
src/chk-systemd.cpp: In member function 'const char* ChkBus::getState(const char*)':
src/chk-systemd.cpp:120:15: error: ordered comparison of pointer with integer zero ('const char*' and 'int')
120 | if (state < 0) {
| ~~~~~~^~~
Diffstat (limited to 'pkgs/tools/admin/chkservice')
| -rw-r--r-- | pkgs/tools/admin/chkservice/default.nix | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/pkgs/tools/admin/chkservice/default.nix b/pkgs/tools/admin/chkservice/default.nix index 949a65290d226..9e2965a0db2a0 100644 --- a/pkgs/tools/admin/chkservice/default.nix +++ b/pkgs/tools/admin/chkservice/default.nix @@ -1,4 +1,13 @@ -{ stdenv, fetchFromGitHub, cmake, ninja, pkg-config, systemd, ncurses, lib }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, ninja +, pkg-config +, systemd +, ncurses +}: stdenv.mkDerivation rec { pname = "chkservice"; @@ -8,9 +17,19 @@ stdenv.mkDerivation rec { owner = "linuxenko"; repo = "chkservice"; rev = version; - hash = "sha256:0dfvm62h6dwg18f17fn58nr09mfh6kylm8wy88j00fiy13l4wnb6"; + hash = "sha256-ZllO6Ag+OgAkQp6jSv000NUEskXFuhMcCo83A4Wp2zU="; }; + patches = [ + # Pull fix pending upstream inclusion for gcc-11 support: + # https://github.com/linuxenko/chkservice/pull/38 + (fetchpatch { + name = "gcc-11.patch"; + url = "https://github.com/linuxenko/chkservice/commit/26b12a7918c8a3bc449c92b458e6cd5c2d7b2e05.patch"; + hash = "sha256-LaJLlqRyn1eoahbW2X+hDSt8iV4lhNRn0j0kLHB+RhM="; + }) + ]; + # Tools needed during build time nativeBuildInputs = [ cmake |