3
0
Fork 0
forked from mirrors/nixpkgs

samba4: Add extra useful dependencies and attempt to fix darwin build

This commit is contained in:
William A. Kennington III 2015-04-02 17:43:26 -07:00
parent 394562655f
commit 99173f0266
3 changed files with 30 additions and 1 deletions

View file

@ -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}')

View file

@ -27,6 +27,11 @@
, zlib ? null , zlib ? null
, ncurses ? null , ncurses ? null
, libcap ? null , libcap ? null
, libunwind ? null
, dbus ? null
, libibverbs ? null
, librdmacm ? null
, systemd ? null
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -40,6 +45,7 @@ stdenv.mkDerivation rec {
patches = [ patches = [
./4.x-no-persistent-install.patch ./4.x-no-persistent-install.patch
./4.x-heimdal-compat.patch ./4.x-heimdal-compat.patch
./4.x-fix-ctdb-deps.patch
]; ];
buildInputs = [ buildInputs = [
@ -53,7 +59,7 @@ stdenv.mkDerivation rec {
gnutls libgcrypt libgpgerror gnutls libgcrypt libgpgerror
zlib ncurses libcap zlib ncurses libcap libunwind dbus libibverbs librdmacm systemd
]; ];
postPatch = '' postPatch = ''

View file

@ -8517,6 +8517,16 @@ let
libgcrypt = libgcrypt_1_6; libgcrypt = libgcrypt_1_6;
python = python2; python = python2;
pythonPackages = python2Packages; 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; samba = samba4;