Merge pull request #11667 from anderspapitto/sysdig

Sysdig
This commit is contained in:
Michael Raskin 2015-12-12 21:37:16 +01:00
commit e2833a8841
3 changed files with 34 additions and 8 deletions

View file

@ -0,0 +1,26 @@
{ stdenv, fetchurl, unzip }:
stdenv.mkDerivation rec {
name = "libb64-${version}";
version = "1.2";
src = fetchurl {
url = "http://download.draios.com/dependencies/libb64-1.2.src.zip";
md5 = "a609809408327117e2c643bed91b76c5";
};
buildInputs = [ unzip ];
installPhase = ''
mkdir -p $out $out/lib $out/bin $out/include
cp -r include/* $out/include/
cp base64/base64 $out/bin/
cp src/libb64.a src/cencode.o src/cdecode.o $out/lib/
'';
meta = {
inherit version;
description = "ANSI C routines for fast base64 encoding/decoding";
license = stdenv.lib.licenses.publicDomain;
};
}

View file

@ -1,15 +1,15 @@
{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses}:
{stdenv, fetchurl, cmake, luajit, kernel, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl}:
let
inherit (stdenv.lib) optional optionalString;
s = rec {
baseName="sysdig";
version = "0.1.102";
version = "0.5.1";
name="${baseName}-${version}";
url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256 = "0mrz14wvcb8m8idr4iqbr3jmxfs7dlmh06n0q9fcfph75wkc5fp0";
sha256 = "08wnk0593ljdq466hk0npsjc0gbm37nsjm1x2ilsf58n1xl8dmfs";
};
buildInputs = [
cmake zlib luajit ncurses
cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
];
in
stdenv.mkDerivation {
@ -20,9 +20,7 @@ stdenv.mkDerivation {
};
cmakeFlags = [
"-DUSE_BUNDLED_LUAJIT=OFF"
"-DUSE_BUNDLED_ZLIB=OFF"
"-DUSE_BUNDLED_NCURSES=OFF"
"-DUSE_BUNDLED_DEPS=OFF"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF";
preConfigure = ''
export INSTALL_MOD_PATH="$out"

View file

@ -6837,6 +6837,8 @@ let
libjson = callPackage ../development/libraries/libjson { };
libb64 = callPackage ../development/libraries/libb64 { };
judy = callPackage ../development/libraries/judy { };
keybinder = callPackage ../development/libraries/keybinder {
@ -8329,7 +8331,7 @@ let
rubberband = callPackage ../development/libraries/rubberband {
inherit (vamp) vampSDK;
};
sad = callPackage ../applications/science/logic/sad { };
sbc = callPackage ../development/libraries/sbc { };