diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-24 22:28:00 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-24 22:28:00 +0000 |
| commit | f806eca299854ed6d3d63e65e49b07841d83e1f9 (patch) | |
| tree | f9fa8ac0c832e4ef45be1ba2c7a8865f0e59bd6c /pkgs/tools/filesystems/ntfs-3g | |
| parent | 6b5dff3bb956a230703b094d918b43b1149ffbcf (diff) | |
Actually upgrade ntfs-3g
ntfsprogs collection is now part of ntfs-3g svn path=/nixpkgs/trunk/; revision=31065
Diffstat (limited to 'pkgs/tools/filesystems/ntfs-3g')
| -rw-r--r-- | pkgs/tools/filesystems/ntfs-3g/default.nix | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index df75cbf59667a..2a8bef6c6edde 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,28 +1,37 @@ -{stdenv, fetchurl, utillinux}: +{stdenv, fetchurl, utillinux, libuuid +, crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { - pname = "ntfs-3g"; + pname = "ntfs-3g_ntfsprogs"; version = "2011.4.12"; name = "${pname}-${version}"; + buildInputs = [libuuid] ++ stdenv.lib.optionals crypto [gnutls libgcrypt]; + buildNativeInputs = stdenv.lib.optional crypto pkgconfig; + src = fetchurl { - url = "http://pkgs.fedoraproject.org/repo/pkgs/ntfs-3g/ntfs-3g-2010.10.2.tgz/91405690f25822142cdcb43d03e62d3f/ntfs-3g-2010.10.2.tgz"; - sha256 = "0wcyks4nvi1kck8i2dgwfsy5zxhil0v0xam8zbg1p592xbqygiqp"; + url = "http://tuxera.com/opensource/${name}.tgz"; + sha256 = "01gfn94f4fdrl1rjhhxjvjbarr1mipdi4pmhhwirp0gy1dzp935a"; }; - preConfigure = '' - substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + patchPhase = '' + substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' + substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' substituteInPlace libfuse-lite/mount_util.c \ --replace /bin/mount ${utillinux}/bin/mount \ --replace /bin/umount ${utillinux}/bin/umount ''; - configureFlags = "--disable-ldconfig --exec-prefix=\${prefix} --enable-mount-helper"; + configureFlags = + '' + --disable-ldconfig --exec-prefix=''${prefix} --enable-mount-helper + --enable-posix-acls --enable-xattr-mappings --${if crypto then "enable" else "disable"}-crypto + ''; postInstall = '' # Prefer ntfs-3g over the ntfs driver in the kernel. - ln -s mount.ntfs-3g $out/sbin/mount.ntfs + ln -sv mount.ntfs-3g $out/sbin/mount.ntfs ''; meta = { |