diff options
author | Jörg Thalheim <joerg@thalheim.io> | 2023-06-10 20:06:22 +0200 |
---|---|---|
committer | Jörg Thalheim <joerg@thalheim.io> | 2023-06-10 20:09:25 +0200 |
commit | 6c771643775d33efb50e4ac8b38b48041a783c5c (patch) | |
tree | 293cdd3f61cb3caf8894a257a4dd073918b17a91 /pkgs/os-specific/linux/sysdig | |
parent | c24713c8f8d7c42d4a6ef97c435b26ef36bc55cd (diff) |
sysdig: update drivers for latest kernel
Diffstat (limited to 'pkgs/os-specific/linux/sysdig')
-rw-r--r-- | pkgs/os-specific/linux/sysdig/default.nix | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 64f6350d24b1d..1a59244f8d4c3 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,8 +5,8 @@ let # Compare with https://github.com/draios/sysdig/blob/dev/cmake/modules/falcosecurity-libs.cmake - libsRev = "0.10.5"; - libsSha256 = "sha256-5a5ePcMHAlniJ8sU/5kKdRp5YkJ6tcr4h5Ru4Oc2kQY="; + libsRev = "0.11.0"; + libsSha256 = "sha256-QvRTz3yMS6i+qdiSG51wvho9D7w/dMQhY72OYd3qOgU="; # Compare with https://github.com/falcosecurity/libs/blob/master/cmake/modules/valijson.cmake#L17 valijson = fetchFromGitHub { @@ -16,11 +16,12 @@ let sha256 = "sha256-ZD19Q2MxMQd3yEKbY90GFCrerie5/jzgO8do4JQDoKM="; }; + # https://github.com/draios/sysdig/blob/0.31.5/cmake/modules/driver.cmake driver = fetchFromGitHub { owner = "falcosecurity"; repo = "libs"; - rev = libsRev; - sha256 = libsSha256; + rev = "5.0.1+driver"; + sha256 = "sha256-CQ6QTcyTnThpJHDXgOM1Zdp5SG7rngp9XtEM+2mS8ro="; }; in @@ -35,6 +36,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-RuoPqVulATtn7jSga/8fECs7weNfjt/YFh7iHmfCKjw="; }; + # to fix the build against the latest kernel + patches = [ + (fetchpatch { + url = "https://github.com/draios/sysdig/compare/35ded9aab87801281e22898242e24e0bc63873b2...954e6fc6238f21d4870a491395d68a7dd3062aa9.patch"; + sha256 = "sha256-gnLURnv8FW5LvqjbreCf9DPGdBcn7rfizGeznFqJ+Fk="; + }) + ]; + nativeBuildInputs = [ cmake perl installShellFiles pkg-config ]; buildInputs = [ luajit @@ -117,9 +126,13 @@ stdenv.mkDerivation rec { if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/scap.ko"; then sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko else - xz -d $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko.xz - sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko - xz $out/lib/modules/${kernel.modDirVersion}/extra/scap.ko + for i in $out/lib/modules/${kernel.modDirVersion}/{extra,updates}/scap.ko.xz; do + if test -f "$i"; then + xz -d $i + sed -i "s#$kernel_dev#................................#g" ''${i%.xz} + xz -9 ''${i%.xz} + fi + done fi ''; |