Merge pull request #148626 from trofi/fix-sysdig-for-ncurses-6.3

sysdig: fix pending upstream inclusion for ncurses-6.3
2021-12-04 22:03:35 +00:00
parent e5c93511f3 134db1c397
commit 0e3be5c30b
1 changed files with 14 additions and 1 deletions
@@ -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