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

Merging with upstream

Browse Source
This commit is contained in:
Parnell Springmeyer
2017-01-29 05:54:01 -06:00
parent c5f1f9a3b5 82bcfef109
commit 6777e6f812
155 changed files with 4670 additions and 2571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/fuse/default.nix
+6 -1
View File
@@ -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