zfs: Add upstream patch bc151f7 to fix kernel 3.18 builds

Additionally, recognize that the contents of the nix-build.patch are included in the upstream tree as 3cd33ff and will be released in 0.6.4.
2014-11-11 00:52:14 -08:00
parent 43be15a89c
commit c202893b8d
2 changed files with 69 additions and 1 deletions
@@ -8,7 +8,11 @@ stdenv.mkDerivation {
    sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19";
  };

-  patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ];
+  patches = [
+    ./mount_zfs_prefix.patch
+    ./nix-build.patch # Remove in >=0.6.4
+    ./remove-lock-checks.patch # Remove in >=0.6.4
+  ];

  buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ];