lol

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

+30 -1
+13
pkgs/servers/samba/4.x-fix-ctdb-deps.patch
··· 1 + diff --git a/ctdb/wscript b/ctdb/wscript 2 + index 3e2a992..3fe15cc 100755 3 + --- a/ctdb/wscript 4 + +++ b/ctdb/wscript 5 + @@ -568,7 +568,7 @@ def build(bld): 6 + source='ib/ibwrapper_test.c', 7 + includes='include include/internal', 8 + deps='''replace talloc ctdb-client ctdb-common 9 + - ctdb-system''' + 10 + + ctdb-system ctdb-common-util''' + 11 + ib_deps, 12 + install_path='${CTDB_TEST_LIBDIR}') 13 +
+7 -1
pkgs/servers/samba/4.x.nix
··· 27 27 , zlib ? null 28 28 , ncurses ? null 29 29 , libcap ? null 30 + , libunwind ? null 31 + , dbus ? null 32 + , libibverbs ? null 33 + , librdmacm ? null 34 + , systemd ? null 30 35 }: 31 36 32 37 stdenv.mkDerivation rec { ··· 40 45 patches = [ 41 46 ./4.x-no-persistent-install.patch 42 47 ./4.x-heimdal-compat.patch 48 + ./4.x-fix-ctdb-deps.patch 43 49 ]; 44 50 45 51 buildInputs = [ ··· 53 59 54 60 gnutls libgcrypt libgpgerror 55 61 56 - zlib ncurses libcap 62 + zlib ncurses libcap libunwind dbus libibverbs librdmacm systemd 57 63 ]; 58 64 59 65 postPatch = ''
+10
pkgs/top-level/all-packages.nix
··· 8517 8517 libgcrypt = libgcrypt_1_6; 8518 8518 python = python2; 8519 8519 pythonPackages = python2Packages; 8520 + cups = if stdenv.isDarwin then null else cups; 8521 + pam = if stdenv.isDarwin then null else pam; 8522 + libaio = if stdenv.isDarwin then null else libaio; 8523 + ceph = if stdenv.isDarwin then null else ceph; 8524 + glusterfs = if stdenv.isDarwin then null else glusterfs; 8525 + libcap = if stdenv.isLinux then libcap else null; 8526 + dbus = if stdenv.isLinux then dbus else null; 8527 + libibverbs = if stdenv.isLinux then libibverbs else null; 8528 + librdmacm = if stdenv.isLinux then librdmacm else null; 8529 + systemd = if stdenv.isLinux then system else null; 8520 8530 }; 8521 8531 8522 8532 samba = samba4;