diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-25 12:47:13 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-25 12:47:13 +0000 |
| commit | f222d9874643197fb61ca8460449f10abae1a4fd (patch) | |
| tree | b8b9c2dcdf54cc418ef54d579b7d21e0830006b8 /pkgs/os-specific/linux/sysdig | |
| parent | 1f04b4a566d3c8f8de5354ed09dee46557c4abe3 (diff) | |
| parent | e725c927d4a09ee116fe18f2f0718364678a321f (diff) | |
| download | nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.gz nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.bz2 nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.lz nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.xz nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.tar.zst nixlib-f222d9874643197fb61ca8460449f10abae1a4fd.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/sysdig')
| -rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 27e41825b98f..76858ab5e48e 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -1,8 +1,15 @@ -{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 inherit (stdenv.lib) optional optionalString; baseName = "sysdig"; version = "0.10.0"; + # 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 stdenv.mkDerivation { name = "${baseName}-${version}"; @@ -24,6 +31,8 @@ stdenv.mkDerivation { cmakeFlags = [ "-DUSE_BUNDLED_DEPS=OFF" + "-DUSE_BUNDLED_JQ=ON" + "-DSYSDIG_VERSION=${version}" ] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; preConfigure = '' @@ -32,6 +41,11 @@ stdenv.mkDerivation { 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) '' make install_driver kernel_dev=${kernel.dev} |