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) { | ~~~~~~^~~
This commit is contained in:
parent
a1d85c0fca
commit
394521c780
|
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
pname = "chkservice";
|
pname = "chkservice";
|
||||||
|
@ -8,9 +17,19 @@ stdenv.mkDerivation rec {
|
||||||
owner = "linuxenko";
|
owner = "linuxenko";
|
||||||
repo = "chkservice";
|
repo = "chkservice";
|
||||||
rev = version;
|
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
|
# Tools needed during build time
|
||||||
nativeBuildInputs = [
|
nativeBuildInputs = [
|
||||||
cmake
|
cmake
|
||||||
|
|
|
@ -208,9 +208,7 @@ with pkgs;
|
||||||
}
|
}
|
||||||
'');
|
'');
|
||||||
|
|
||||||
chkservice = callPackage ../tools/admin/chkservice {
|
chkservice = callPackage ../tools/admin/chkservice { };
|
||||||
stdenv = gcc10StdenvCompat;
|
|
||||||
};
|
|
||||||
|
|
||||||
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
|
addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue