diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-27 10:44:00 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-27 10:44:00 -0700 |
| commit | f93d565c2899a8e4cce831fb3e12259ab9e7990c (patch) | |
| tree | 57fe733257026a996c083b86b03fd8da467048e2 /pkgs/servers/samba | |
| parent | e080827fdb1727b86390284833245da1d4ab9854 (diff) | |
| parent | 8b844dce2d35a445bc89322052375e0f2aced094 (diff) | |
| download | nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar.gz nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar.bz2 nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar.lz nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar.xz nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.tar.zst nixlib-f93d565c2899a8e4cce831fb3e12259ab9e7990c.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index aa28a3fca787..50918dfc4abc 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { "--private-libraries=NONE" "--builtin-libraries=replace" ] - ++ optional (enableKerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" + ++ optional (enableKerberos && kerberos.implementation == "krb5") "--with-system-mitkrb5" ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; |