* The mount hack is gone, just use the regular mount from

util-linux-ng and make sure that the needed mount helpers
  (e.g. ntfs3g) are in /var/lib/current-system/sw/sbin.

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

modules/tasks/filesystems.nix

@@ -102,22 +102,9 @@ let
   
     system.sbin.mount = mkOption {
       internal = true;
-      default = pkgs.utillinuxng.override {
+      default = pkgs.utillinuxng;
-        buildMountOnly = true;
-        mountHelpers = pkgs.buildEnv {
-          name = "mount-helpers";
-          paths = [
-            pkgs.ntfs3g
-            pkgs.mount_cifs
-            pkgs.nfsUtils
-          ];
-          pathsToLink = "/sbin";
-        } + "/sbin";
-      };
       description = "
-        A patched `mount' command that looks in a directory in the Nix
+        Package containing mount and umount.
-        store instead of in /sbin for mount helpers (like mount.ntfs-3g or
-        mount.cifs).
       ";
     };
     
@@ -240,10 +227,14 @@ in
 
 {
   require = [options];
+  
   services = {
     extraJobs = [{
       name = "filesystems";
       inherit job;
     }];
   };
+
+  # Add the mount helpers to the system path so that `mount' can find them.
+  environment.systemPackages = [pkgs.ntfs3g pkgs.mount_cifs pkgs.nfsUtils];
 }