samba fix and xserver cleanup

svn path=/nixos/trunk/; revision=8791

upstart-jobs/default.nix

@@ -135,12 +135,6 @@ import ../upstart-jobs/gather.nix {
       allowSFTP = config.get ["services" "sshd" "allowSFTP"];
     })
 
-  # Samba service.
-  ++ optional ["services" "samba" "enable"]
-    (import ../upstart-jobs/samba.nix {
-      inherit (pkgs) samba glibc pwdutils;
-    })
-
   # NTP daemon.
   ++ optional ["services" "ntp" "enable"]
     (import ../upstart-jobs/ntpd.nix {
@@ -155,7 +149,9 @@ import ../upstart-jobs/gather.nix {
       inherit config;
       inherit (pkgs) stdenv writeText lib xterm slim xorg mesa
         gnome compiz feh kdebase kdelibs xkeyboard_config
-        openssh x11_ssh_askpass;
+        openssh x11_ssh_askpass nvidiaDrivers;
+      libX11 = pkgs.xlibs.libX11;
+      libXext = pkgs.xlibs.libXext;
       fontDirectories = import ../system/fonts.nix {inherit pkgs;};
     })
 
@@ -166,6 +162,13 @@ import ../upstart-jobs/gather.nix {
       inherit (pkgs) glibc pwdutils;
     })
 
+  # Samba service.
+  ++ optional ["services" "samba" "enable"]
+    (import ../upstart-jobs/samba.nix {
+      inherit pkgs;
+      inherit (pkgs) glibc pwdutils samba;
+    })
+
   # CUPS (printing) daemon.
   ++ optional ["services" "printing" "enable"]
     (import ../upstart-jobs/cupsd.nix {

upstart-jobs/samba.nix

@@ -1,9 +1,9 @@
-{samba, glibc, pwdutils}:
+{pkgs, samba, glibc, pwdutils}:
 
 let
+  
   user="smbguest";
   group="smbguest";
-
 in
 
 {

upstart-jobs/xserver.nix

@@ -3,6 +3,7 @@
 , kdelibs, kdebase
 , xkeyboard_config
 , openssh, x11_ssh_askpass
+, nvidiaDrivers, libX11, libXext
 
 , config
 
@@ -23,13 +24,10 @@ let
 
   optional = condition: x: if condition then [x] else [];
 
-  #TODO, make these parameters
-  nvidiaDrivers = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).nvidiaDrivers;
-  #berylcore = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylCore;
-  #berylmanager = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylManager;
-  #berylemerald = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).berylEmerald;
-  libX11 = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libX11;
-  libXext = (import ../../nixpkgs/pkgs/top-level/all-packages.nix {}).xlibs.libXext;
+  #Beryl parameters
+  #berylcore
+  #berylmanager
+  #berylemerald
 
   # Get a bunch of user settings.
   videoDriver = getCfg "videoDriver";