diff options
Diffstat (limited to 'pkgs/servers/samba/4.x.nix')
-rw-r--r-- | pkgs/servers/samba/4.x.nix | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index eca6c31478f9..610ca73cc1cc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl_ns , docbook_xml_dtd_42, readline, talloc, ntdb, tdb, tevent, ldb, popt, iniparser -, pythonPackages, libbsd +, pythonPackages, libbsd, nss_wrapper, socket_wrapper, uid_wrapper, libarchive # source3/wscript optionals -, heimdal ? null # Samba only supports heimdal for kerberos although mit-krb5 is being worked on +, kerberos ? null , openldap ? null , cups ? null , pam ? null @@ -11,7 +11,6 @@ , acl ? null , libaio ? null , fam ? null -, ctdb ? null , ceph ? null , glusterfs ? null @@ -31,21 +30,24 @@ }: stdenv.mkDerivation rec { - name = "samba-4.1.17"; + name = "samba-4.2.0"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "07fban97xmf4r5y48jp6ajfdki6vx4239lwq9gmvwjy8x44mvsvs"; + sha256 = "03s9pjdgq6nlv2lcnlmxlhhj8m5drgv6z4xy9zkgwwd92mw0b9k6"; }; - patches = [ ./4.x-no-persistent-install.patch ]; + patches = [ + ./4.x-no-persistent-install.patch + ./4.x-heimdal-compat.patch + ]; buildInputs = [ python pkgconfig perl libxslt docbook_xsl_ns docbook_xml_dtd_42 readline talloc ntdb tdb tevent ldb popt iniparser pythonPackages.subunit - libbsd + libbsd nss_wrapper socket_wrapper uid_wrapper libarchive - heimdal openldap cups pam avahi acl libaio fam ctdb ceph glusterfs + kerberos openldap cups pam avahi acl libaio fam ceph glusterfs libiconv gettext @@ -61,7 +63,7 @@ stdenv.mkDerivation rec { "--with-static-modules=NONE" "--with-shared-modules=ALL" "--with-winbind" - ] ++ (if heimdal != null then [ "--with-ads" ] else [ "--without-ads" ]) + ] ++ (if kerberos != null then [ "--with-ads" ] else [ "--without-ads" ]) ++ (if openldap != null then [ "--with-ldap" ] else [ "--without-ldap" ]) ++ (if cups != null then [ "--enable-cups" ] else [ "--disable-cups" ]) ++ (if pam != null then [ "--with-pam" "--with-pam_smbpass" ] @@ -77,27 +79,35 @@ stdenv.mkDerivation rec { "--with-syslog" "--with-automount" ] ++ (if libaio != null then [ "--with-aio-support" ] else [ "--without-aio-support" ]) - ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) - ++ (if ctdb != null then [ "--with-cluster-support" "--with-ctdb-dir=${ctdb}" ] - else [ "--without-cluster-support" ]) - ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ]) + ++ (if fam != null then [ "--with-fam" ] else [ "--without-fam" ]) ++ [ + "--with-cluster-support" + ] ++ (if ceph != null then [ "--with-libcephfs=${ceph}" ] else [ ]) ++ (if glusterfs != null then [ "--enable-glusterfs" ] else [ "--disable-glusterfs" ]) ++ [ + # dynconfig/wscript options "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" # buildtools/wafsamba/wscript options - "--bundled-libraries=${if heimdal != null then "NONE" else "com_err"}" + "--bundled-libraries=${if kerberos.implementation == "heimdal" then "NONE" else "com_err"}" "--private-libraries=NONE" "--builtin-libraries=replace" ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ]) ++ (if gettext != null then [ "--with-gettext=${gettext}" ] else [ "--without-gettext" ]) ++ [ + # source4/lib/tls/wscript options ] ++ (if gnutls != null && libgcrypt != null && libgpgerror != null then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [ + # wscript options - ] ++ stdenv.lib.optional (heimdal == null) "--without-ad-dc"; + ] ++ stdenv.lib.optional (kerberos.implementation == "krb5") "--with-system-mitkrb5" + ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [ + + # ctdb/wscript + "--enable-infiniband" + "--enable-pmda" + ]; stripAllList = [ "bin" "sbin" ]; |