summary refs log tree commit diff
path: root/pkgs/os-specific/linux/zfs
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2020-12-08 16:38:30 +0000
committerOrivej Desh <orivej@gmx.fr>2020-12-10 10:34:44 +0000
commit1026c02f6d71e5ba8cc969d0b4ab743881f8a094 (patch)
treee708753e2aabc5f4daeb4bdf072f1a3dcf8525bf /pkgs/os-specific/linux/zfs
parent59d8ee790eaa49fa8f872257e745d45111b9dae4 (diff)
downloadnixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar.gz
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar.bz2
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar.lz
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar.xz
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.tar.zst
nixpkgs-1026c02f6d71e5ba8cc969d0b4ab743881f8a094.zip
zfs: fix build with linux-rt
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
-rw-r--r--pkgs/os-specific/linux/zfs/default.nix9
1 files changed, 9 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index a83e554b6f0..a2464aeb586 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -176,6 +176,11 @@ let
         maintainers = with maintainers; [ hmenke jcumming jonringer wizeman fpletz globin mic92 ];
       };
     };
+
+  linux-rt-patch = fetchpatch {
+    url = "https://github.com/openzfs/zfs/commit/ab4fb9b74e9d089fc9a261c4f41e19697ad6a4ca.patch";
+    sha256 = "1nrxmb4rhrkgncav6dzwm66l0700fi72qkkcs0w6pkm850srws36";
+  };
 in {
   # also check if kernel version constraints in
   # ./nixos/modules/tasks/filesystems/zfs.nix needs
@@ -188,6 +193,8 @@ in {
     version = "2.0.0";
 
     sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+
+    extraPatches = [ linux-rt-patch ];
   };
 
   zfsUnstable = common {
@@ -198,5 +205,7 @@ in {
     version = "2.0.0";
 
     sha256 = "1kriz6pg8wj98izvjc60wp23lgcp4k3mzhpkgj74np73rzgy6v8r";
+
+    extraPatches = [ linux-rt-patch ];
   };
 }