MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sysdig: fix pending upstream inclusion for ncurses-6.3

Browse source 
Without the change the build fails as:

    sysdig/userspace/sinspui/cursescomponents.cpp: In member function 'void curses_textbox::print_no_data()':
    sysdig/userspace/sinspui/cursescomponents.cpp:878:15: error: format not a string literal and no format arguments [-Werror=format-security]
      878 |   wstr.c_str());
          |               ^
This commit is contained in:
Sergei Trofimovich 2021-12-04 19:33:40 +00:00
parent e0c74a4d1f
commit 134db1c397
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pkgs/os-specific/linux/sysdig/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, cmake, kernel, installShellFiles
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
}:
@ -14,6 +14,19 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns=";
};
patches = [
# Fix pending upstream inclusion for ncurses-6.3 support:
# https://github.com/draios/sysdig/pull/1810
(fetchpatch {
name = "ncurses-6.3.patch";
url = "https://github.com/draios/sysdig/commit/1e37fffe0337b8f8f8e0b5345db2f8631851c209.patch";
sha256 = "sha256-T+yC6iXQ3MY+ub0c+Hv+cC18PV8YlAOKB6YB1Hdm7Yc=";
# change 'a/userspace/sinspui' for 'a/userspace/libsinsp' to follow upstream rename.
stripLen = 3;
extraPrefix = "userspace/libsinsp/";
})
];
nativeBuildInputs = [ cmake perl installShellFiles ];
buildInputs = [
luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb protobuf grpc