swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 05:19:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #222156 from Mic92/sysdig

Browse source 
sysdig: 0.30.2 -> 0.31.3
This commit is contained in:
7c6f434c 2023-03-22 13:32:03 +00:00 committed by GitHub
parent 185627e77c a06e5ea365
commit 5706ae4934
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/sysdig/default.nix
View file

@ -1,12 +1,12 @@
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, kernel, installShellFiles, pkg-config
, luajit, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, protobuf, grpc
, yaml-cpp, nlohmann_json, re2
, yaml-cpp, nlohmann_json, re2, zstd
}:
let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.9.1";
libsSha256 = "sha256-X+zLEnage8AuGdGn9sl1RN9b1CKTA1ErrdPNbYKY0s0=";
libsRev = "0.10.5";
libsSha256 = "sha256-5a5ePcMHAlniJ8sU/5kKdRp5YkJ6tcr4h5Ru4Oc2kQY=";
# Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17
valijson = fetchFromGitHub {
@ -31,13 +31,13 @@ let
in
stdenv.mkDerivation rec {
pname = "sysdig";
version = "0.30.2";
version = "0.31.3";
src = fetchFromGitHub {
owner = "draios";
repo = "sysdig";
rev = version;
sha256 = "sha256-bDlrnTfm43zpYBIiP2MGB+LM5jtalmeUNtWHgxe81HM=";
sha256 = "sha256-TMh2gw/vw6DbhKGwbqU2+c0DTpRaMZqUM83KE18NDmI=";
};
nativeBuildInputs = [ cmake perl installShellFiles pkg-config ];
@ -58,6 +58,7 @@ stdenv.mkDerivation rec {
yaml-cpp
jsoncpp
nlohmann_json
zstd
] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ];
@ -97,7 +98,7 @@ stdenv.mkDerivation rec {
echo "falcosecurity-libs checksum needs to be updated!"
exit 1
fi
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization")
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -lzstd -labsl_synchronization")
'' + lib.optionalString (kernel != null) ''
export INSTALL_MOD_PATH="$out"
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"