From cfd831a40a2c101c6faa5aca4361518c391516a2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 6 Jun 2015 12:01:50 -0700 Subject: [PATCH] Revert "samba: Use built in kerberos" This reverts commit 6b17264e08eaa96d0a1b24f635769ea80d4e8b16. --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87c4267e764..8aac40f0723 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,8 +8981,7 @@ let samba4 = callPackage ../servers/samba/4.x.nix { python = python2; - # Samba is tightly coupled to kerberos so let it provide its own - kerberos = null; + kerberos = libheimdal; gnutls = gnutls33; cups = if stdenv.isDarwin then null else cups; pam = if stdenv.isDarwin then null else pam;