JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

svn path=/nixpkgs/trunk/; revision=12416
This commit is contained in:
Eelco Dolstra 2008-07-24 13:11:02 +00:00
parent 8f309bc83e
commit c32f7569dc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/misc/ntfs-3g/default.nix
View File

@ -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="
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}";
configureFlags = "--enable-shared --disable-static --disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper";
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";
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -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 {