public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samba: make kerberos optional

Browse Source 
svn path=/nixpkgs/trunk/; revision=21397
This commit is contained in:
Yury G. Kudryashov 2010-04-28 09:39:01 +00:00
parent 0089b865e9
commit 8a1dd10d81
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/servers/samba/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchurl, readline, pam, openldap, kerberos, popt { stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam
, iniparser, libunwind, fam, acl , acl
, useKerberos ? false, kerberos ? null
# Eg. smbclient and smbspool require a smb.conf file. # Eg. smbclient and smbspool require a smb.conf file.
# If you set configDir to "" an empty configuration file # If you set configDir to "" an empty configuration file
@ -20,7 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "08x3ng7ls5c1a95v7djx362i55wdlmnvarpr7rhng5bb55s9n5qn"; 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"; preConfigure = "cd source";

2
pkgs/top-level/all-packages.nix
View File

@ -5648,7 +5648,7 @@ let
samba = makeOverridable (import ../servers/samba) { samba = makeOverridable (import ../servers/samba) {
inherit stdenv fetchurl readline openldap pam kerberos popt iniparser inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
libunwind acl fam; libunwind acl fam;
}; };
shishi = import ../servers/shishi { shishi = import ../servers/shishi {