public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #29931 from Mic92/sysdig 

sysdig: remove broken patchelf call
This commit is contained in:
Jörg Thalheim 2017-09-29 17:08:38 +01:00 committed by GitHub
parent 65dd753912 09d3bab32d
commit 63f56e0d2f
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/os-specific/linux/sysdig/default.nix
View File

@ -35,23 +35,7 @@ stdenv.mkDerivation rec {
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
''; '';
libPath = makeLibraryPath [ postInstall = optionalString (kernel != null) ''
zlib
luajit
ncurses
jsoncpp
curl
jq
openssl
libb64
gcc
stdenv.cc.cc
];
postInstall = optionalString (!stdenv.isDarwin) ''
patchelf --set-rpath "$libPath" "$out/bin/sysdig"
patchelf --set-rpath "$libPath" "$out/bin/csysdig"
'' + 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/}