From 39d1b11ff7d6002cb9d664f649739d5709f90189 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Aug 2009 21:10:33 +0000
Subject: [PATCH] * 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 | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/modules/tasks/filesystems.nix b/modules/tasks/filesystems.nix
index 5002ff25295..6ef6ec7840e 100644
--- a/modules/tasks/filesystems.nix
+++ b/modules/tasks/filesystems.nix
@@ -102,22 +102,9 @@ let
   
     system.sbin.mount = mkOption {
       internal = true;
-      default = pkgs.utillinuxng.override {
-        buildMountOnly = true;
-        mountHelpers = pkgs.buildEnv {
-          name = "mount-helpers";
-          paths = [
-            pkgs.ntfs3g
-            pkgs.mount_cifs
-            pkgs.nfsUtils
-          ];
-          pathsToLink = "/sbin";
-        } + "/sbin";
-      };
+      default = pkgs.utillinuxng;
       description = "
-        A patched `mount' command that looks in a directory in the Nix
-        store instead of in /sbin for mount helpers (like mount.ntfs-3g or
-        mount.cifs).
+        Package containing mount and umount.
       ";
     };
     
@@ -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];
 }