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

Merge branch 'master' into hardened-stdenv

Browse Source
This commit is contained in:
Franz Pletz
2016-02-15 20:05:29 +01:00
parent 359ba5c971 2029027d88
commit 41698c9efa
310 changed files with 9217 additions and 1667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/sysdig/default.nix
+9 -3
View File
@@ -2,14 +2,14 @@
let
inherit (stdenv.lib) optional optionalString;
baseName = "sysdig";
version = "0.6.0";
version = "0.8.0";
in
stdenv.mkDerivation {
name="${baseName}-${version}";
src = fetchurl {
url = "https://github.com/draios/sysdig/archive/${version}.tar.gz";
sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3";
sha256 = "1939k3clwxg09m1bn0szqiy2nxg66srl72n7476jc58hgaraq3dr";
};
buildInputs = [
@@ -33,7 +33,13 @@ stdenv.mkDerivation {
kernel_dev=${kernel.dev}
kernel_dev=''${kernel_dev#/nix/store/}
kernel_dev=''${kernel_dev%%-linux*dev*}
sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
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 = with stdenv.lib; {