diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index df75cbf5966..2a8bef6c6ed 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 = { diff --git a/pkgs/tools/filesystems/ntfsprogs/default.nix b/pkgs/tools/filesystems/ntfsprogs/default.nix deleted file mode 100644 index 3deb668eddb..00000000000 --- a/pkgs/tools/filesystems/ntfsprogs/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{stdenv, fetchurl, libuuid}: - -stdenv.mkDerivation rec { - name = "ntfsprogs-2.0.0"; - - src = fetchurl { - url = "mirror://sourceforge/linux-ntfs/${name}.tar.bz2"; - sha256 = "ad36e19706c7303b10aa0a9bf2c2dd0309b91cd0171f1c9eb361d94a85017432"; - }; - - buildInputs = [libuuid]; - - preConfigure = - '' - substituteInPlace ntfsprogs/Makefile.in --replace /sbin $out/sbin - ''; - - meta = { - description = "Utilities for the NTFS filesystem"; - homepage = http://sourceforge.net/projects/linux-ntfs; - license = "GPL"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 618c4a80455..f9243b7e05f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1070,7 +1070,8 @@ let ntfs3g = callPackage ../tools/filesystems/ntfs-3g { }; - ntfsprogs = callPackage ../tools/filesystems/ntfsprogs { }; + # ntfsprogs are merged into ntfs-3g + ntfsprogs = pkgs.ntfs3g; ntp = callPackage ../tools/networking/ntp { };