pyrox.dev
Merge pull request #17124 from markus1189/sysdig
sysdig: 0.10.0 -> 0.11.0
authored by Graham Christensen and committed by GitHub c4c75514 e641974f
+22
-8
pkgs/os-specific/linux/sysdig/default.nix
+22
-8
pkgs/os-specific/linux/sysdig/default.nix
···
1
-
{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
1
+
{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
2
2
let
3
3
inherit (stdenv.lib) optional optionalString;
4
4
s = rec {
5
-
baseName="sysdig";
6
-
version = "0.10.0";
7
-
name="${baseName}-${version}";
8
-
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
9
-
sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj";
5
+
name = "sysdig-${version}";
6
+
version = "0.11.0";
7
+
owner = "draios";
8
+
repo = "sysdig";
9
+
rev = version;
10
+
sha256 = "131bafa7jy16r2jwph50j0bxwqdvr319fsfhqkavx6xy18i31q3v";
10
11
};
11
12
buildInputs = [
12
13
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
13
14
];
15
+
# sysdig-0.11.0 depends on some headers from jq which are not
16
+
# installed by default.
17
+
# Relevant sysdig issue: https://github.com/draios/sysdig/issues/626
18
+
jq-prefix = fetchurl {
19
+
url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
20
+
sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
21
+
};
14
22
in
15
23
stdenv.mkDerivation {
16
24
inherit (s) name version;
17
25
inherit buildInputs;
18
-
src = fetchurl {
19
-
inherit (s) url sha256;
26
+
src = fetchFromGitHub {
27
+
inherit (s) owner repo rev sha256;
20
28
};
21
29
postPatch = ''
22
30
sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
···
24
32
25
33
cmakeFlags = [
26
34
"-DUSE_BUNDLED_DEPS=OFF"
35
+
"-DUSE_BUNDLED_JQ=ON"
36
+
"-DSYSDIG_VERSION=${s.version}"
27
37
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
28
38
preConfigure = ''
29
39
export INSTALL_MOD_PATH="$out"
30
40
'' + optionalString (kernel != null) ''
31
41
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
42
+
'';
43
+
preBuild = ''
44
+
mkdir -p jq-prefix/src
45
+
cp ${jq-prefix} jq-prefix/src/jq-1.5.tar.gz
32
46
'';
33
47
postInstall = optionalString (kernel != null) ''
34
48
make install_driver