sysdig: 0.10.0 -> 0.11.0
This commit is contained in:
parent
afcf3176ec
commit
2a3fe4df43
|
@ -1,22 +1,30 @@
|
||||||
{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
|
{stdenv, fetchurl, fetchFromGitHub, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
|
||||||
let
|
let
|
||||||
inherit (stdenv.lib) optional optionalString;
|
inherit (stdenv.lib) optional optionalString;
|
||||||
s = rec {
|
s = rec {
|
||||||
baseName="sysdig";
|
name = "sysdig-${version}";
|
||||||
version = "0.10.0";
|
version = "0.11.0";
|
||||||
name="${baseName}-${version}";
|
owner = "draios";
|
||||||
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
|
repo = "sysdig";
|
||||||
sha256 = "0hs0r9z9j7padqdcj69bwx52iw6gvdl0w322qwivpv12j3prcpsj";
|
rev = version;
|
||||||
|
sha256 = "131bafa7jy16r2jwph50j0bxwqdvr319fsfhqkavx6xy18i31q3v";
|
||||||
};
|
};
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
|
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
|
||||||
];
|
];
|
||||||
|
# sysdig-0.11.0 depends on some headers from jq which are not
|
||||||
|
# installed by default.
|
||||||
|
# Relevant sysdig issue: https://github.com/draios/sysdig/issues/626
|
||||||
|
jq-prefix = fetchurl {
|
||||||
|
url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz";
|
||||||
|
sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4";
|
||||||
|
};
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
inherit (s) name version;
|
inherit (s) name version;
|
||||||
inherit buildInputs;
|
inherit buildInputs;
|
||||||
src = fetchurl {
|
src = fetchFromGitHub {
|
||||||
inherit (s) url sha256;
|
inherit (s) owner repo rev sha256;
|
||||||
};
|
};
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
|
sed '1i#include <cmath>' -i userspace/libsinsp/{cursesspectro,filterchecks}.cpp
|
||||||
|
@ -24,12 +32,18 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DUSE_BUNDLED_DEPS=OFF"
|
"-DUSE_BUNDLED_DEPS=OFF"
|
||||||
|
"-DUSE_BUNDLED_JQ=ON"
|
||||||
|
"-DSYSDIG_VERSION=${s.version}"
|
||||||
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
|
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
export INSTALL_MOD_PATH="$out"
|
export INSTALL_MOD_PATH="$out"
|
||||||
'' + optionalString (kernel != null) ''
|
'' + optionalString (kernel != null) ''
|
||||||
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
|
||||||
'';
|
'';
|
||||||
|
preBuild = ''
|
||||||
|
mkdir -p jq-prefix/src
|
||||||
|
cp ${jq-prefix} jq-prefix/src/jq-1.5.tar.gz
|
||||||
|
'';
|
||||||
postInstall = optionalString (kernel != null) ''
|
postInstall = optionalString (kernel != null) ''
|
||||||
make install_driver
|
make install_driver
|
||||||
kernel_dev=${kernel.dev}
|
kernel_dev=${kernel.dev}
|
||||||
|
|
Loading…
Reference in New Issue