Merge pull request #48794 from markuskowa/fix-samba-ib
samba: remove defunct infiniband support
This commit is contained in:
commit
48fd1fb0d7
2 changed files with 1 additions and 5 deletions
|
@ -3,10 +3,8 @@
|
|||
, docbook_xml_dtd_42, readline, talloc
|
||||
, popt, iniparser, libbsd, libarchive, libiconv, gettext
|
||||
, krb5Full, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs
|
||||
, gnutls
|
||||
, ncurses, libunwind, libibverbs, librdmacm, systemd
|
||||
, gnutls, ncurses, libunwind, systemd
|
||||
|
||||
, enableInfiniband ? false
|
||||
, enableLDAP ? false
|
||||
, enablePrinting ? false
|
||||
, enableMDNS ? false
|
||||
|
@ -47,7 +45,6 @@ stdenv.mkDerivation rec {
|
|||
libbsd libarchive zlib fam libiconv gettext libunwind krb5Full
|
||||
]
|
||||
++ optionals stdenv.isLinux [ libaio systemd ]
|
||||
++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
|
||||
++ optional enableLDAP openldap
|
||||
++ optional (enablePrinting && stdenv.isLinux) cups
|
||||
++ optional enableMDNS avahi
|
||||
|
|
|
@ -13684,7 +13684,6 @@ with pkgs;
|
|||
});
|
||||
|
||||
samba4Full = lowPrio (samba4.override {
|
||||
enableInfiniband = true;
|
||||
enableLDAP = true;
|
||||
enablePrinting = true;
|
||||
enableMDNS = true;
|
||||
|
|
Loading…
Reference in a new issue