diff options
| author | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
|---|---|---|
| committer | Robert Schütz <robert.schuetz@stud.uni-heidelberg.de> | 2019-05-03 16:01:49 +0200 |
| commit | 56b560942c7b567b1e3d6c48cce0e5891f4e72e6 (patch) | |
| tree | abce48e2633a2692972c16e46188ed852cd543c5 /pkgs/tools/filesystems | |
| parent | 3567b1390fde8681a0f0b4581f2babbe863ede9a (diff) | |
| parent | b1bd1854d0a7c19311d5f898f5e4780fe48b3fd5 (diff) | |
| download | nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.gz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.bz2 nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.lz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.xz nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.tar.zst nixpkgs-56b560942c7b567b1e3d6c48cce0e5891f4e72e6.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/tools/filesystems')
| -rw-r--r-- | pkgs/tools/filesystems/ntfs-3g/default.nix | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/pkgs/tools/filesystems/ntfs-3g/default.nix b/pkgs/tools/filesystems/ntfs-3g/default.nix index 7ee54a63fbb..c919bfade3a 100644 --- a/pkgs/tools/filesystems/ntfs-3g/default.nix +++ b/pkgs/tools/filesystems/ntfs-3g/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, utillinux, libuuid +{stdenv, fetchurl, utillinux, libuuid , crypto ? false, libgcrypt, gnutls, pkgconfig}: stdenv.mkDerivation rec { @@ -12,17 +12,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional crypto pkgconfig; src = fetchurl { - url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; + url = "https://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz"; sha256 = "1mb228p80hv97pgk3myyvgp975r9mxq56c6bdn1n24kngcfh4niy"; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/n/ntfs-3g/1:2016.2.22AR.1+dfsg-1/debian/patches/0003-CVE-2017-0358.patch"; - sha256 = "0hd05q9q06r18k8pmppvch1sslzqln5fvqj51d5r72g4mnpavpj3"; - }) - ]; - patchPhase = '' substituteInPlace src/Makefile.in --replace /sbin '@sbindir@' substituteInPlace ntfsprogs/Makefile.in --replace /sbin '@sbindir@' |