From 99173f0266cb0106bd2483e95d04e346cf1201d3 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 2 Apr 2015 17:43:26 -0700
Subject: samba4: Add extra useful dependencies and attempt to fix darwin build

---
 pkgs/servers/samba/4.x-fix-ctdb-deps.patch | 13 +++++++++++++
 pkgs/servers/samba/4.x.nix                 |  8 +++++++-
 pkgs/top-level/all-packages.nix            | 10 ++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/samba/4.x-fix-ctdb-deps.patch

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 = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a21470eec0a7..c8ada7f2f27c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8517,6 +8517,16 @@ let
     libgcrypt = libgcrypt_1_6;
     python = python2;
     pythonPackages = python2Packages;
+    cups = if stdenv.isDarwin then null else cups;
+    pam = if stdenv.isDarwin then null else pam;
+    libaio = if stdenv.isDarwin then null else libaio;
+    ceph = if stdenv.isDarwin then null else ceph;
+    glusterfs = if stdenv.isDarwin then null else glusterfs;
+    libcap = if stdenv.isLinux then libcap else null;
+    dbus = if stdenv.isLinux then dbus else null;
+    libibverbs = if stdenv.isLinux then libibverbs else null;
+    librdmacm = if stdenv.isLinux then librdmacm else null;
+    systemd = if stdenv.isLinux then system else null;
   };
 
   samba = samba4;
-- 
cgit 1.4.1