From 8a1dd10d81c3b9bd60c5bbd3dcb1d6aae8047363 Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Wed, 28 Apr 2010 09:39:01 +0000 Subject: [PATCH] samba: make kerberos optional svn path=/nixpkgs/trunk/; revision=21397 --- pkgs/servers/samba/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 64b7c5fc7de4..5f8ba337eabf 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt -, iniparser, libunwind, fam, acl +{ stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam +, acl +, useKerberos ? false, kerberos ? null # Eg. smbclient and smbspool require a smb.conf file. # If you set configDir to "" an empty configuration file @@ -20,7 +21,8 @@ stdenv.mkDerivation rec { sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; }; - buildInputs = [readline pam openldap kerberos popt iniparser libunwind fam acl]; + buildInputs = [readline pam openldap popt iniparser libunwind fam acl] + ++ stdenv.lib.optional useKerberos kerberos; preConfigure = "cd source"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 603e980afc3e..264be85efa68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5648,7 +5648,7 @@ let samba = makeOverridable (import ../servers/samba) { inherit stdenv fetchurl readline openldap pam kerberos popt iniparser - libunwind acl fam; + libunwind acl fam; }; shishi = import ../servers/shishi {