From 124a61f10d6c93440a9733b665ff6fdea2c90969 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 28 Jun 2015 13:41:27 +0300 Subject: [PATCH] Fix alternative samba configuration evaluations --- pkgs/servers/samba/4.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index ab3aac54cdd..1d957a8ec60 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -61,11 +61,13 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" - "--bundled-libraries=${if enableKerberos && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" + "--bundled-libraries=${if enableKerberos && kerberos != null && + kerberos.implementation == "heimdal" then "NONE" else "com_err"}" "--private-libraries=NONE" "--builtin-libraries=replace" ] - ++ optional (enableKerberos && kerberos.implementation == "krb5") "--with-system-mitkrb5" + ++ optional (enableKerberos && kerberos != null && + kerberos.implementation == "krb5") "--with-system-mitkrb5" ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];