diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-08 10:14:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 10:14:11 +0100 |
| commit | b3a9a65955d730e97afd44dd987606afeac37e72 (patch) | |
| tree | af77d71f796cf3d7a8be798df88bb84e1ca9e193 /pkgs/os-specific/linux | |
| parent | 29d76cf0e1d2a37bddf75d4ecfce284e99f28e4a (diff) | |
| parent | 75c28ebdf7a5b2111bc6dcfeb6b6f9f061f364c2 (diff) | |
| download | nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar.gz nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar.bz2 nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar.lz nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar.xz nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.tar.zst nixpkgs-b3a9a65955d730e97afd44dd987606afeac37e72.zip | |
Merge pull request #84595 from NixOS/zfs
zfs: fix build against 5.6
Diffstat (limited to 'pkgs/os-specific/linux')
| -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 |