diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-15 20:05:29 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-15 20:05:29 +0100 |
| commit | 41698c9efae1302f17b9ecef585979d7ddf7621a (patch) | |
| tree | a1fd4746388fce0d47d9da9ac0fefc96b523ef4d /pkgs/os-specific/linux/sysdig/default.nix | |
| parent | 359ba5c971ec8aab1b62cc295e33da8f780b80ce (diff) | |
| parent | 2029027d8883ab22e3044a71a4a33cc7a0beaf2e (diff) | |
| download | nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.gz nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.bz2 nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.lz nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.xz nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.tar.zst nixpkgs-41698c9efae1302f17b9ecef585979d7ddf7621a.zip | |
Merge branch 'master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/sysdig/default.nix')
| -rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 0316d9b0967..00f9a66f0cd 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -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; { |