From cd833ea6ddae0a0d57077b56d0ddeef30587a9ef Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 Jan 2015 00:07:49 -0800 Subject: [PATCH] kerberos: Disable on darwin --- pkgs/servers/openafs-client/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 9d9df2e38c0..1d9bd52d912 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -34,11 +34,13 @@ stdenv.mkDerivation { ./regen.sh - export KRB5_CONFIG=${kerberos}/bin/krb5-config + ${optionalString (kerberos != null) '' + export KRB5_CONFIG=${kerberos}/bin/krb5-config" + ''} configureFlagsArray=( "--with-linux-kernel-build=$TMP/linux" - "--with-krb5" + ${stdenv.lib.optionalString (kerberos != null) "--with-krb5"} "--sysconfdir=/etc/static" ) ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 531c55f55e5..6442458f5fe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5530,7 +5530,8 @@ let hamlib = callPackage ../development/libraries/hamlib { }; # TODO : Add MIT Kerberos and let admin choose. - kerberos = heimdal; + # TODO : Fix kerberos on Darwin + kerberos = if stdenv.isDarwin then null else heimdal; heimdal = callPackage ../development/libraries/kerberos/heimdal.nix { openldap = openldap.override {