pyrox.dev
Merge pull request #205795 from Mic92/sysdig
sysdig: 0.29.3 -> 0.30.2
+24
-6
pkgs/os-specific/linux/sysdig/default.nix
+24
-6
pkgs/os-specific/linux/sysdig/default.nix
···
1
1
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
2
2
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
3
-
, libyamlcpp, nlohmann_json
3
+
, libyamlcpp, nlohmann_json, re2
4
4
}:
5
5
6
6
with lib;
7
7
let
8
8
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
9
-
libsRev = "e5c53d648f3c4694385bbe488e7d47eaa36c229a";
10
-
libsSha256 = "sha256-pG10y5PpDqaF/cq8oAvax5B/ls2UTRQd7tCfBjWVf0U=";
9
+
libsRev = "0.9.1";
10
+
libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0=";
11
11
12
12
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
13
13
valijson = fetchFromGitHub {
···
17
17
sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM=";
18
18
};
19
19
20
+
driver = fetchFromGitHub {
21
+
owner = "falcosecurity";
22
+
repo = "libs";
23
+
rev = "3.0.1+driver";
24
+
sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c=";
25
+
};
26
+
20
27
in
21
28
stdenv.mkDerivation rec {
22
29
pname = "sysdig";
23
-
version = "0.29.3";
30
+
version = "0.30.2";
24
31
25
32
src = fetchFromGitHub {
26
33
owner = "draios";
27
34
repo = "sysdig";
28
35
rev = version;
29
-
sha256 = "sha256-dMLeroOd9CgvmgQdPfX8oBxQSyksZi/hP4vO03JhlF0=";
36
+
sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM=";
30
37
};
31
38
32
39
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
···
40
47
gcc
41
48
elfutils
42
49
tbb
50
+
libb64
51
+
re2
43
52
protobuf
44
53
grpc
45
54
libyamlcpp
···
57
66
sha256 = libsSha256;
58
67
}} libs
59
68
chmod -R +w libs
60
-
cmakeFlagsArray+=("-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs" "-DVALIJSON_INCLUDE=${valijson}/include")
69
+
cp -r ${driver} driver-src
70
+
chmod -R +w driver-src
71
+
cmakeFlagsArray+=(
72
+
"-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
73
+
"-DVALIJSON_INCLUDE=${valijson}/include"
74
+
"-DDRIVER_SOURCE_DIR=$(pwd)/driver-src/driver"
75
+
)
61
76
'';
62
77
63
78
cmakeFlags = [
64
79
"-DUSE_BUNDLED_DEPS=OFF"
65
80
"-DSYSDIG_VERSION=${version}"
81
+
"-DUSE_BUNDLED_B64=OFF"
82
+
"-DUSE_BUNDLED_TBB=OFF"
83
+
"-DUSE_BUNDLED_RE2=OFF"
66
84
"-DCREATE_TEST_TARGETS=OFF"
67
85
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
68
86