From f72ae4da79e15c78cf22eb99a0af6d1816de5e7b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 6 Mar 2015 13:12:33 +0100 Subject: [PATCH] samba4: Fix evaluation http://hydra.nixos.org/build/20173661 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 610ca73cc1c..362885417b7 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" # buildtools/wafsamba/wscript options - "--bundled-libraries=${if kerberos.implementation == "heimdal" then "NONE" else "com_err"}" + "--bundled-libraries=${if kerberos != null && kerberos.implementation == "heimdal" then "NONE" else "com_err"}" "--private-libraries=NONE" "--builtin-libraries=replace" ] ++ (if libiconv != null then [ "--with-libiconv=${libiconv}" ] else [ ]) @@ -101,7 +101,7 @@ stdenv.mkDerivation rec { then [ "--enable-gnutls" ] else [ "--disable-gnutls" ]) ++ [ # wscript options - ] ++ stdenv.lib.optional (kerberos.implementation == "krb5") "--with-system-mitkrb5" + ] ++ stdenv.lib.optional (kerberos != null && kerberos.implementation == "krb5") "--with-system-mitkrb5" ++ stdenv.lib.optional (kerberos == null) "--without-ad-dc" ++ [ # ctdb/wscript