diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2020-04-07 10:16:04 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2020-04-07 13:00:55 +0100 |
| commit | 75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2 (patch) | |
| tree | 185aa4e8ad45bb299c8469b94878209a8adf8654 /pkgs/os-specific/linux/zfs | |
| parent | 718305392f0e66ac4693eaaf66e49fce8a3ae744 (diff) | |
| download | nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar.gz nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar.bz2 nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar.lz nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar.xz nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.tar.zst nixpkgs-75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2.zip | |
zfs: fix build against 5.6
Diffstat (limited to 'pkgs/os-specific/linux/zfs')
| -rw-r--r-- | pkgs/os-specific/linux/zfs/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 738171bb5ec..423b78ede39 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils +{ stdenv, fetchFromGitHub, fetchpatch +, autoreconfHook, utillinux, nukeReferences, coreutils , perl, buildPackages , configFile ? "all" @@ -40,7 +41,12 @@ let inherit rev sha256; }; - patches = extraPatches; + patches = [ (fetchpatch { + # https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288 + # will be included in zfs 0.5.4 as well + url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch"; + sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb"; + }) ] ++ extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts |