zkfuse: remove applied patch

2 files changed, 3 insertions, 23 deletions

diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix
index 04755108bc06..0738ee84cab7 100644
--- a/pkgs/tools/filesystems/zkfuse/default.nix
+++ b/pkgs/tools/filesystems/zkfuse/default.nix
@@ -1,15 +1,10 @@
 { stdenv, lib, zookeeper, zookeeper_mt, fuse, pkgconfig, autoreconfHook, log4cxx, boost, tree }:
 
 stdenv.mkDerivation rec {
-  name = "zkfuse";
+  name = "zkfuse-${version}";
+  inherit (zookeeper) version src;
 
-  src = zookeeper.src;
-  patches = [
-    # see: https://issues.apache.org/jira/browse/ZOOKEEPER-1929
-    ./zookeeper-1929.patch
-  ];
-
-  setSourceRoot = "export sourceRoot=${zookeeper.name}/src/contrib/zkfuse";
+  sourceRoot = "${zookeeper.name}/src/contrib/zkfuse";
 
   buildInputs = [ autoreconfHook zookeeper_mt log4cxx boost fuse ];
 
diff --git a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch b/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch
deleted file mode 100644
index e99dbdf33e03..000000000000
--- a/pkgs/tools/filesystems/zkfuse/zookeeper-1929.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/contrib/zkfuse/src/zkadapter.cc b/src/contrib/zkfuse/src/zkadapter.cc
-index 886051d..93dbef5 100644
---- a/src/zkadapter.cc
-+++ b/src/zkadapter.cc
-@@ -845,7 +845,10 @@ ZooKeeperAdapter::getNodeData(const string &path,
-             string("Unable to get data of node ") + path, rc 
-         );
-     } else {
--        return string( buffer, buffer + len );
-+        if (len == -1) {
-+            len = 0;
-+        };
-+        return string( buffer, len );
-     }
- }