From 1e2a4064f4bbf823622b9a32d51616576d6cd4d2 Mon Sep 17 00:00:00 2001
From: Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de>
Date: Wed, 19 Mar 2008 13:08:11 +0000
Subject: fixed references to /bin/mount and /bin/umount

svn path=/nixpkgs/trunk/; revision=11204
---
 pkgs/misc/ntfs-3g/default.nix   | 9 +++++++--
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/misc/ntfs-3g/default.nix b/pkgs/misc/ntfs-3g/default.nix
index ffacf40be0f1..0d0ec76c252d 100644
--- a/pkgs/misc/ntfs-3g/default.nix
+++ b/pkgs/misc/ntfs-3g/default.nix
@@ -9,9 +9,14 @@ stdenv.mkDerivation rec {
     sha256 = "3394bd1c9d0f3640803dc65ebbb42ee945db47e06f1a2b84ad257bad5e3c10f3";
   };
 
-  buildInputs = [fuse pkgconfig];
+  buildInputs = [fuse pkgconfig utillinux];
+
+  preConfigure="
+    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
+  ";
 
-  preConfigure="sed -e 's:/sbin:@sbindir@:' -i src/Makefile.in";
   configureFlags="--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix}";
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cb47b25bf00..75899ce69e52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6045,7 +6045,7 @@ let pkgs = rec {
     };
 
   ntfs3g = import ../misc/ntfs-3g {
-    inherit fetchurl stdenv fuse pkgconfig;
+    inherit fetchurl stdenv fuse pkgconfig utillinux;
   };
 
   ntfsprogs = import ../misc/ntfsprogs {
-- 
cgit 1.4.1