diff options
| author | Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de> | 2008-03-19 13:08:11 +0000 |
|---|---|---|
| committer | Tobias Hammerschmidt <tobias.hammerschmidt@gmx.de> | 2008-03-19 13:08:11 +0000 |
| commit | 1e2a4064f4bbf823622b9a32d51616576d6cd4d2 (patch) | |
| tree | 12296456a9a83bd84e2b5d2db3399ff1d9bc2bf1 /pkgs | |
| parent | 597536e4946a55b7962d37075f920024444a4876 (diff) | |
| download | nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar.gz nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar.bz2 nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar.lz nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar.xz nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.tar.zst nixlib-1e2a4064f4bbf823622b9a32d51616576d6cd4d2.zip | |
fixed references to /bin/mount and /bin/umount
svn path=/nixpkgs/trunk/; revision=11204
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/ntfs-3g/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 8 insertions, 3 deletions
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 { |