summary refs log tree commit diff
path: root/pkgs/servers/samba
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-09-30 21:16:17 +0200
committerEelco Dolstra <edolstra@gmail.com>2016-09-30 21:22:57 +0200
commit3b89a6e0209fb75e36473905dd8bbae1e30d2ac5 (patch)
treea74180722004a92578488fad89ddaa4faa5a2a51 /pkgs/servers/samba
parente9687611b608690d1158ea0259970763e9bf76bc (diff)
downloadnixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar.gz
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar.bz2
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar.lz
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar.xz
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.tar.zst
nixpkgs-3b89a6e0209fb75e36473905dd8bbae1e30d2ac5.zip
samba: Use bundled tdb and ldb
Diffstat (limited to 'pkgs/servers/samba')
-rw-r--r--pkgs/servers/samba/4.x.nix9
1 files changed, 3 insertions, 6 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 51a7c6dbcfb..a3bb2d44216 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" ];