diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-09-29 17:08:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 17:08:38 +0100 |
| commit | 63f56e0d2f4d43422ecda3d097889a109e08aea3 (patch) | |
| tree | 6fdf9c236fd05ec75658715d81fe1281fa0ed852 | |
| parent | 65dd7539120ad1c6a661c479cef7916352b8c500 (diff) | |
| parent | 09d3bab32dc5e943b1eed22086ab976ee7726dc3 (diff) | |
| download | nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar.gz nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar.bz2 nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar.lz nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar.xz nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.tar.zst nixpkgs-63f56e0d2f4d43422ecda3d097889a109e08aea3.zip | |
Merge pull request #29931 from Mic92/sysdig
sysdig: remove broken patchelf call
| -rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index fbd2cff1b17..18d473e2194 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -35,23 +35,7 @@ stdenv.mkDerivation rec { export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ''; - libPath = makeLibraryPath [ - 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) '' + postInstall = optionalString (kernel != null) '' make install_driver kernel_dev=${kernel.dev} kernel_dev=''${kernel_dev#/nix/store/} |