3
0
Fork 0
forked from mirrors/nixpkgs

samba: remove defunct infiniband support

Even if infiniband support is enabled the option
is ignored by the configure script and no depencies
to libibverbs.so or librdmacm.so is contained in
the output.
This commit is contained in:
Markus Kowalewski 2018-10-21 21:55:26 +02:00
parent ca127588c1
commit 8d7870d6c5
No known key found for this signature in database
GPG key ID: D865C8A91D7025EB
2 changed files with 2 additions and 6 deletions

View file

@ -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

View file

@ -13648,7 +13648,6 @@ with pkgs;
});
samba4Full = lowPrio (samba4.override {
enableInfiniband = true;
enableLDAP = true;
enablePrinting = true;
enableMDNS = true;
@ -18595,7 +18594,7 @@ with pkgs;
rclone = callPackage ../applications/networking/sync/rclone { };
rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
rcs = callPackage ../applications/version-management/rcs { };
rdesktop = callPackage ../applications/networking/remote/rdesktop { };