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

svn path=/nixpkgs/trunk/; revision=23935

pkgs/desktops/kde-4.4/pim/default.nix

@@ -8,12 +8,18 @@ stdenv.mkDerivation {
     url = mirror://kde/stable/4.4.5/src/kdepim-4.4.5.tar.bz2;
     sha256 = "0n95wjk1ly7zfn9wv589a9hrc0r7wvik7jrvsgimnxr0rapxk3bp";
   };
-  builder = ./builder.sh;  
+
   cmakeFlags = "-DBUILD_kleopatra=OFF"; # doesn't build with new boost
   buildInputs = [ cmake qt4 perl boost gpgme stdenv.gcc.libc libassuan libgpgerror libxslt
                   shared_mime_info libXScrnSaver
-                  kdelibs automoc4 phonon akonadi strigi soprano qca2 ];
-  propagatedBuildInputs = [ kdepimlibs kdepim_runtime ];
+                  kdelibs kdepimlibs automoc4 phonon akonadi strigi soprano qca2 ];
+  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 = {
     description = "KDE PIM tools";
     longDescription = ''

pkgs/servers/samba/default.nix

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