* ntfs-3g: install sbin/mount.ntfs-3g. Don't pass FUSE as

a dependency (ntfs-3g has its own copy of FUSE).

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

pkgs/misc/ntfs-3g/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{stdenv, fetchurl, utillinux}:
+
 stdenv.mkDerivation rec {
   pname = "ntfs-3g";
   version = "1.2712";
@@ -9,18 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "01rdx3mzp12pbi3q9l279z78w155fh5axaksxmm3xl9m9ljy4c9j";
   };
 
-  buildInputs = [fuse pkgconfig utillinux];
+  preConfigure = ''
+    substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' 
+    substituteInPlace libfuse-lite/mount_util.c \
+      --replace /bin/mount ${utillinux}/bin/mount \
+      --replace /bin/umount ${utillinux}/bin/umount
+  '';
 
-  preConfigure="
+  configureFlags = "--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper";
-    sed -e 's:/sbin:@sbindir@:' -i src/Makefile.in
-    sed -e 's:/bin/mount:${utillinux}/bin/mount:' -i libfuse-lite/mount_util.c
-    sed -e 's:/bin/umount:${utillinux}/bin/umount:' -i libfuse-lite/mount_util.c
-  ";
-
-  configureFlags="--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix}";
 
   meta = {
     homepage = http://www.ntfs-3g.org;
-    description = "FUSE-base ntfs driver with full write support";
+    description = "FUSE-base NTFS driver with full write support";
   };
 }

pkgs/top-level/all-packages.nix

@@ -7224,7 +7224,7 @@ let pkgs = rec {
   };
 
   ntfs3g = import ../misc/ntfs-3g {
-    inherit fetchurl stdenv fuse pkgconfig utillinux;
+    inherit fetchurl stdenv utillinux;
   };
 
   ntfsprogs = import ../misc/ntfsprogs {