From 3b89a6e0209fb75e36473905dd8bbae1e30d2ac5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Sep 2016 21:16:17 +0200 Subject: [PATCH] samba: Use bundled tdb and ldb --- pkgs/servers/samba/4.x.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 51a7c6dbcfb6..a3bb2d44216b 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent -, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, popt, iniparser, libbsd, libarchive, libiconv, gettext , kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , gnutls, libgcrypt, libgpgerror , ncurses, libunwind, libibverbs, librdmacm, systemd @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline talloc ntdb tdb /*tevent*/ ldb popt iniparser + docbook_xml_dtd_45 */ readline talloc popt iniparser libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos ] ++ optionals stdenv.isLinux [ libaio pam systemd ] @@ -62,9 +62,6 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" - "--bundled-libraries=tevent" # see #19013 - "--private-libraries=NONE" - "--builtin-libraries=NONE" ] ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];