Merge branch 'master' into x-updates

2013-08-28 10:37:41 +02:00
parent f0c59e322d ce57c3e917
commit 2fda1165da
103 changed files with 1971 additions and 889 deletions
--- a/pkgs/servers/samba/default.nix
+++ b/pkgs/servers/samba/default.nix
@@ -68,6 +68,8 @@ stdenv.mkDerivation rec {
      ln -sv ../../../bin/smbspool $out/lib/cups/backend/smb
      mkdir -pv $out/etc/openldap/schema
      cp ../examples/LDAP/samba.schema $out/etc/openldap/schema
+      cp -v ../nsswitch/libnss_wins.so "$out/lib"
+      cp -v ../nsswitch/libnss_winbind.so "$out/lib"
    '' # */
    + stdenv.lib.optionalString (configDir == "") "touch $out/lib/smb.conf";