Skip to content

Commit 75c28eb

Browse files
committedApr 7, 2020
zfs: fix build against 5.6
1 parent 7183053 commit 75c28eb

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed
 

Diff for: ‎pkgs/os-specific/linux/zfs/default.nix

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
{ stdenv, fetchFromGitHub, autoreconfHook, utillinux, nukeReferences, coreutils
1+
{ stdenv, fetchFromGitHub, fetchpatch
2+
, autoreconfHook, utillinux, nukeReferences, coreutils
23
, perl, buildPackages
34
, configFile ? "all"
45

@@ -40,7 +41,12 @@ let
4041
inherit rev sha256;
4142
};
4243

43-
patches = extraPatches;
44+
patches = [ (fetchpatch {
45+
# https://github.com/openzfs/zfs/pull/9961#issuecomment-585827288
46+
# will be included in zfs 0.5.4 as well
47+
url = "https://gist.githubusercontent.com/satmandu/67cbae9c4d461be0e64428a1707aef1c/raw/ba0fb65f17ccce5b710e4ce86a095de577f7dfe1/k5.6.3.patch";
48+
sha256 = "0zay7cz078v7wcnk7xl96blp7j6y64q1migb91c7h66zkpikqvgb";
49+
}) ] ++ extraPatches;
4450

4551
postPatch = optionalString buildKernel ''
4652
patchShebangs scripts

0 commit comments

Comments
 (0)
Please sign in to comment.