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

Samba: option to compile winbind which is used by some apps under Wine

Browse Source 
svn path=/nixpkgs/trunk/; revision=23935
This commit is contained in:
Evgeny Egorochkin 2010-09-26 05:07:41 +00:00
parent e41a0ef012
commit 8a68518454
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/desktops/kde-4.4/pim/default.nix
View File

@ -8,12 +8,18 @@ stdenv.mkDerivation {
url = mirror://kde/stable/4.4.5/src/kdepim-4.4.5.tar.bz2; url = mirror://kde/stable/4.4.5/src/kdepim-4.4.5.tar.bz2;
sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp"; sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
}; };
builder = ./builder.sh;
cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
shared_mime_info libXScrnSaver shared_mime_info libXScrnSaver
kdelibs automoc4 phonon akonadi strigi soprano qca2 ]; kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
propagatedBuildInputs = [ kdepimlibs kdepim_runtime ]; patchPhase = ''
find .. -name CMakeLists.txt | xargs sed -i -e "s@DESTINATION \''${KDE4_DBUS_INTERFACES_DIR}@DESTINATION \''${CMAKE_INSTALL_PREFIX}/share/dbus-1/interfaces/@"
'';
postInstall = ''
mkdir -p $out/nix-support/
echo ${akonadi} ${kdepimlibs} ${kdepim_runtime} > $out/nix-support/propagated-user-env-packages
'';
meta = { meta = {
description = "KDE PIM tools"; description = "KDE PIM tools";
longDescription = '' longDescription = ''

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam { stdenv, fetchurl, readline, pam, openldap, popt, iniparser, libunwind, fam
, acl , acl
, useKerberos ? false, kerberos ? null , useKerberos ? false, kerberos ? null, winbind ? true
# 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
@ -11,8 +11,11 @@
# /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you # /etc/samba/smb.conf. That's why nixos touches /etc/samba/smb.conf even if you
# don't enable the samba upstart service. # don't enable the samba upstart service.
, configDir ? "/etc/samba" , configDir ? "/etc/samba"
}:
}:
let
usewith = flag: option: if flag then "--with-"+option else "";
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "samba-3.3.3"; name = "samba-3.3.3";
@ -42,6 +45,7 @@ stdenv.mkDerivation rec {
--disable-swat --disable-swat
--enable-shared-libs --enable-shared-libs
--with-configdir=${configDir} --with-configdir=${configDir}
${usewith winbind "winbind"}
${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""} ${if stdenv.gcc.libc != null then "--with-libiconv=${stdenv.gcc.libc}" else ""}
''; '';
} }