Merge pull request #105684 from zimbatm/sysdig-bash-completion

sysdig: fix bash-completion location
This commit is contained in:
Michael Raskin 2020-12-03 16:58:25 +00:00 committed by GitHub
commit 752ad7a2f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, kernel
{ stdenv, fetchFromGitHub, cmake, kernel, installShellFiles
, luajit, zlib, ncurses, perl, jsoncpp, libb64, openssl, curl, jq, gcc, elfutils, tbb, c-ares, protobuf, grpc
}:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-lYjMvxMIReANNwMr62u881Nugrs9piOaN3EmrvGzRns=";
};
nativeBuildInputs = [ cmake perl ];
nativeBuildInputs = [ cmake perl installShellFiles ];
buildInputs = [
zlib luajit ncurses jsoncpp libb64 openssl curl jq gcc elfutils tbb c-ares protobuf grpc
] ++ optionals (kernel != null) kernel.moduleBuildDependencies;
@ -38,19 +38,28 @@ stdenv.mkDerivation rec {
export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
'';
postInstall = optionalString (kernel != null) ''
make install_driver
kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/}
kernel_dev=''${kernel_dev%%-linux*dev*}
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
else
xz -d $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko.xz
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
xz $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
fi
'';
postInstall =
''
# Fix the bash completion location
installShellCompletion --bash $out/etc/bash_completion.d/sysdig
rm $out/etc/bash_completion.d/sysdig
rmdir $out/etc/bash_completion.d
rmdir $out/etc
''
+ optionalString (kernel != null) ''
make install_driver
kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/}
kernel_dev=''${kernel_dev%%-linux*dev*}
if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
else
xz -d $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko.xz
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
xz $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
fi
'';
meta = {
description = "A tracepoint-based system tracing tool for Linux (with clients for other OSes)";