summary refs log tree commit diff
path: root/pkgs/servers/samba
diff options
context:
space:
mode:
authorJoachim F <joachifm@users.noreply.github.com>2018-10-23 14:38:41 +0000
committerGitHub <noreply@github.com>2018-10-23 14:38:41 +0000
commit48fd1fb0d78ad12370f89cb82ec300a1a5355852 (patch)
tree9240ab580519000eddb2b00ac6efb79b9dba410d /pkgs/servers/samba
parentcea4806bc5c425d2f9d9e110ae425b010e870662 (diff)
parent8d7870d6c536ac3e5024db5749d26cb3d2890eed (diff)
downloadnixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.gz
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.bz2
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.lz
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.xz
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.tar.zst
nixpkgs-48fd1fb0d78ad12370f89cb82ec300a1a5355852.zip
Merge pull request #48794 from markuskowa/fix-samba-ib
samba: remove defunct infiniband support
Diffstat (limited to 'pkgs/servers/samba')
-rw-r--r--pkgs/servers/samba/4.x.nix5
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 032d2cb0855..38f13fcd1fa 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -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