diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-12-10 04:39:30 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-12-10 04:39:30 +0100 |
| commit | 4f20afbc19b785443a9f4760a57cd17d08c759e4 (patch) | |
| tree | 0e655e9c58fe8e642ea5bf4039a78273fd8be4be /pkgs/tools/filesystems | |
| parent | faad8493f775c33d6ce559dd1fb5989245e95d22 (diff) | |
| parent | f947634aeec30a2f04b832a4dc9423c780a58eae (diff) | |
| download | nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar.gz nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar.bz2 nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar.lz nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar.xz nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.tar.zst nixpkgs-4f20afbc19b785443a9f4760a57cd17d08c759e4.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/zkfuse/default.nix | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/pkgs/tools/filesystems/zkfuse/default.nix b/pkgs/tools/filesystems/zkfuse/default.nix index 89516d525af..456444f3bf5 100644 --- a/pkgs/tools/filesystems/zkfuse/default.nix +++ b/pkgs/tools/filesystems/zkfuse/default.nix @@ -1,14 +1,30 @@ -{ stdenv, lib, zookeeper, zookeeper_mt, fuse, autoreconfHook, log4cxx, boost }: +{ stdenv +, lib +, autoreconfHook +, gnused +, boost +, fuse +, log4cxx +, zookeeper +, zookeeper_mt +}: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "zkfuse"; - inherit (zookeeper) version src; + inherit (zookeeper_mt) version src; - sourceRoot = "${zookeeper.name}/src/contrib/zkfuse"; + sourceRoot = "apache-${zookeeper.pname}-${version}/zookeeper-contrib/zookeeper-contrib-zkfuse"; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gnused ]; buildInputs = [ zookeeper_mt log4cxx boost fuse ]; + postPatch = '' + # Make the async API accessible, and use the proper include path. + sed -i src/zkadapter.h \ + -e '/"zookeeper\.h"/i#define THREADED' \ + -e 's,"zookeeper\.h",<zookeeper/zookeeper.h>,' + ''; + installPhase = '' mkdir -p $out/bin cp -v src/zkfuse $out/bin @@ -16,7 +32,7 @@ stdenv.mkDerivation { meta = with lib; { platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan ztzg ]; license = licenses.asl20; }; } |