diff options
| author | Vladimír Čunát <v@cunat.cz> | 2020-07-29 18:40:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2020-07-29 18:40:28 +0200 |
| commit | 60d89e579393e1e5f72c529775773b9fa20925e5 (patch) | |
| tree | 5d0741bac9746f54b6a42ef949e1634376cba314 /pkgs/servers/samba | |
| parent | cd719c1eae306a6ba1bade46c534bc83fe8f7162 (diff) | |
| parent | d807152c69bf2854631ff9b8706478c10b84401b (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/servers/samba')
| -rw-r--r-- | pkgs/servers/samba/4.x.nix | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 8950a5dd2f60..7ed1a72de0e4 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -31,7 +31,6 @@ , enableProfiling ? true , enableMDNS ? false, avahi , enableDomainController ? false, gpgme, lmdb -, enableKerberos ? true, krb5Full , enableRegedit ? true, ncurses , enableCephFS ? false, libceph , enableGlusterFS ? false, glusterfs, libuuid @@ -92,7 +91,6 @@ stdenv.mkDerivation rec { ++ optional (enablePrinting && stdenv.isLinux) cups ++ optional enableMDNS avahi ++ optionals enableDomainController [ gpgme lmdb ] - ++ optional enableKerberos krb5Full ++ optional enableRegedit ncurses ++ optional (enableCephFS && stdenv.isLinux) libceph ++ optionals (enableGlusterFS && stdenv.isLinux) [ glusterfs libuuid ] @@ -116,13 +114,9 @@ stdenv.mkDerivation rec { "--sysconfdir=/etc" "--localstatedir=/var" "--disable-rpath" - ] ++ singleton (if enableDomainController - then "--with-experimental-mit-ad-dc" - else "--without-ad-dc") - ++ optionals enableKerberos [ - "--with-system-mitkrb5" - "--with-system-mitkdc=${krb5Full}" - ] ++ optionals (!enableLDAP) [ + ] ++ optional (!enableDomainController) + "--without-ad-dc" + ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ] ++ optional enableProfiling "--with-profiling-data" |