summary refs log tree commit diff
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2023-04-04 20:49:34 +0200
committerJörg Thalheim <joerg@thalheim.io>2023-04-04 21:14:28 +0200
commite507ac4bdb0d81711900f6c9eefa78ebc28327f4 (patch)
treec763011701bd2ceff857f56d3ea285063a3ce6eb
parentf877b4fa16722c50272545c59f23b6c44fa9797b (diff)
downloadnixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar.gz
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar.bz2
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar.lz
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar.xz
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.tar.zst
nixpkgs-e507ac4bdb0d81711900f6c9eefa78ebc28327f4.zip
sysdig: also update driver
-rw-r--r--pkgs/os-specific/linux/sysdig/default.nix10
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 70179065acc..2157806e18d 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -19,13 +19,8 @@ let
   driver = fetchFromGitHub {
     owner = "falcosecurity";
     repo = "libs";
-    rev = "3.0.1+driver";
-    sha256 = "sha256-bK9wv17bVl93rOqw7JICnMOM0fDtPIErfMmUmNKOD5c=";
-  };
-  # Workaround for scap-driver compilation error on kernel 6.2: https://github.com/falcosecurity/libs/issues/918
-  driverPatch = fetchpatch {
-    url = "https://github.com/falcosecurity/libs/commit/b8ec3e8637c850066d01543616fe413e8deb9e1f.patch";
-    hash = "sha256-s7iHbOjVqHSWRY4gktZldgrU5OClqRmbqmDtUgFIeh0=";
+    rev = libsRev;
+    sha256 = libsSha256;
   };
 
 in
@@ -73,7 +68,6 @@ stdenv.mkDerivation rec {
     chmod -R +w libs
     cp -r ${driver} driver-src
     chmod -R +w driver-src
-    patch -p1 -d driver-src < ${driverPatch}
     cmakeFlagsArray+=(
       "-DFALCOSECURITY_LIBS_SOURCE_DIR=$(pwd)/libs"
       "-DVALIJSON_INCLUDE=${valijson}/include"