public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samba: Use bundled tdb and ldb

Browse Source
This commit is contained in:
Eelco Dolstra 2016-09-30 21:16:17 +02:00
parent e9687611b6
commit 3b89a6e020
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/servers/samba/4.x.nix
View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl
, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent , docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc
, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext , popt, iniparser, libbsd, libarchive, libiconv, gettext
, kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
, gnutls, libgcrypt, libgpgerror , gnutls, libgcrypt, libgpgerror
, ncurses, libunwind, libibverbs, librdmacm, systemd , ncurses, libunwind, libibverbs, librdmacm, systemd
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* [ 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 libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
] ]
++ optionals stdenv.isLinux [ libaio pam systemd ] ++ optionals stdenv.isLinux [ libaio pam systemd ]
@ -62,9 +62,6 @@ stdenv.mkDerivation rec {
"--enable-fhs" "--enable-fhs"
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
"--bundled-libraries=tevent" # see #19013
"--private-libraries=NONE"
"--builtin-libraries=NONE"
] ]
++ optional (!enableDomainController) "--without-ad-dc" ++ optional (!enableDomainController) "--without-ad-dc"
++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];