diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:54:01 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-01-29 05:54:01 -0600 |
| commit | 6777e6f812913f0213b71392bf2499a3e49b8dee (patch) | |
| tree | 1870777ba0d1ba0be8a66fd94d6c070b62729cdf /pkgs/os-specific/linux/fuse | |
| parent | c5f1f9a3b5bcf5d2990aba0ab086767d1d384922 (diff) | |
| parent | 82bcfef109ecf58ac1503e4cab15ae53dd524f4b (diff) | |
| download | nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.gz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.bz2 nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.lz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.xz nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.tar.zst nixpkgs-6777e6f812913f0213b71392bf2499a3e49b8dee.zip | |
Merging with upstream
Diffstat (limited to 'pkgs/os-specific/linux/fuse')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index db18b13bfb8..b36d13a0b1d 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, utillinux +{ stdenv, fetchFromGitHub, fetchpatch, utillinux , autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { buildInputs = [ utillinux autoconf automake libtool gettext ]; + patches = stdenv.lib.optional stdenv.isAarch64 (fetchpatch { + url = "https://github.com/libfuse/libfuse/commit/914871b20a901e3e1e981c92bc42b1c93b7ab81b.patch"; + sha256 = "1w4j6f1awjrycycpvmlv0x5v9gprllh4dnbjxl4dyl2jgbkaw6pa"; + }); + preConfigure = '' export MOUNT_FUSE_PATH=$out/sbin |