diff options
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x-fix-ctdb-deps.patch | 13 | ||||
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 8 |
2 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/servers/samba/4.x-fix-ctdb-deps.patch b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch new file mode 100644 index 000000000000..338863484124 --- /dev/null +++ b/pkgs/servers/samba/4.x-fix-ctdb-deps.patch @@ -0,0 +1,13 @@ +diff --git a/ctdb/wscript b/ctdb/wscript +index 3e2a992..3fe15cc 100755 +--- a/ctdb/wscript ++++ b/ctdb/wscript +@@ -568,7 +568,7 @@ def build(bld): + source='ib/ibwrapper_test.c', + includes='include include/internal', + deps='''replace talloc ctdb-client ctdb-common +- ctdb-system''' + ++ ctdb-system ctdb-common-util''' + + ib_deps, + install_path='${CTDB_TEST_LIBDIR}') + diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2cc3cc69d3f0..162d6b1d30bf 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -27,6 +27,11 @@ , zlib ? null , ncurses ? null , libcap ? null +, libunwind ? null +, dbus ? null +, libibverbs ? null +, librdmacm ? null +, systemd ? null }: stdenv.mkDerivation rec { @@ -40,6 +45,7 @@ stdenv.mkDerivation rec { patches = [ ./4.x-no-persistent-install.patch ./4.x-heimdal-compat.patch + ./4.x-fix-ctdb-deps.patch ]; buildInputs = [ @@ -53,7 +59,7 @@ stdenv.mkDerivation rec { gnutls libgcrypt libgpgerror - zlib ncurses libcap + zlib ncurses libcap libunwind dbus libibverbs librdmacm systemd ]; postPatch = '' |