alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #213790 from SuperSandro2000/sysdig-lib

Browse source 
sysdig: remove with lib over entire file
This commit is contained in:
Mario Rodas 2023-01-31 19:17:46 -05:00 committed by GitHub
parent 2a5a7b18e1 6dbf077be2
commit e5e2646a07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@
, libyamlcpp, nlohmann_json, re2 , libyamlcpp, nlohmann_json, re2
}: }:
with lib;
let let
# Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake
libsRev = "0.9.1"; libsRev = "0.9.1";
@ -54,7 +53,7 @@ stdenv.mkDerivation rec {
libyamlcpp libyamlcpp
jsoncpp jsoncpp
nlohmann_json nlohmann_json
] ++ optionals (kernel != null) kernel.moduleBuildDependencies; ] ++ lib.optionals (kernel != null) kernel.moduleBuildDependencies;
hardeningDisable = [ "pic" ]; hardeningDisable = [ "pic" ];
@ -82,7 +81,7 @@ stdenv.mkDerivation rec {
"-DUSE_BUNDLED_TBB=OFF" "-DUSE_BUNDLED_TBB=OFF"
"-DUSE_BUNDLED_RE2=OFF" "-DUSE_BUNDLED_RE2=OFF"
"-DCREATE_TEST_TARGETS=OFF" "-DCREATE_TEST_TARGETS=OFF"
] ++ optional (kernel == null) "-DBUILD_DRIVER=OFF"; ] ++ lib.optional (kernel == null) "-DBUILD_DRIVER=OFF";
# needed since luajit-2.1.0-beta3 # needed since luajit-2.1.0-beta3
NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))"; NIX_CFLAGS_COMPILE = "-DluaL_reg=luaL_Reg -DluaL_getn(L,i)=((int)lua_objlen(L,i))";
@ -93,7 +92,7 @@ stdenv.mkDerivation rec {
exit 1 exit 1
fi fi
cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization") cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl -labsl_synchronization")
'' + optionalString (kernel != null) '' '' + lib.optionalString (kernel != null) ''
export INSTALL_MOD_PATH="$out" export INSTALL_MOD_PATH="$out"
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
''; '';
@ -106,7 +105,7 @@ stdenv.mkDerivation rec {
rmdir $out/etc/bash_completion.d rmdir $out/etc/bash_completion.d
rmdir $out/etc rmdir $out/etc
'' ''
+ optionalString (kernel != null) '' + lib.optionalString (kernel != null) ''
make install_driver make install_driver
kernel_dev=${kernel.dev} kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/} kernel_dev=''${kernel_dev#/nix/store/}
@ -121,7 +120,7 @@ stdenv.mkDerivation rec {
''; '';
meta = { meta = with lib; {
description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)"; description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";
license = with licenses; [ asl20 gpl2 mit ]; license = with licenses; [ asl20 gpl2 mit ];
maintainers = [maintainers.raskin]; maintainers = [maintainers.raskin];