diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-27 20:58:38 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-28 15:01:32 -0500 |
| commit | ed5bd8ad4997424f492dedac45da9f57532c6827 (patch) | |
| tree | 6b4e8412c2008fe7f15baebd94fd0ffda21b5f3d /pkgs/os-specific/linux/fuse/common.nix | |
| parent | c0e814a434fe570282a67f8e27768cab57bba732 (diff) | |
| download | nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar.gz nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar.bz2 nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar.lz nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar.xz nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.tar.zst nixpkgs-ed5bd8ad4997424f492dedac45da9f57532c6827.zip | |
fuse: Fix cross-compilation
Diffstat (limited to 'pkgs/os-specific/linux/fuse/common.nix')
| -rw-r--r-- | pkgs/os-specific/linux/fuse/common.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index b9ac015f459..a10a4f466c7 100644 --- a/pkgs/os-specific/linux/fuse/common.nix +++ b/pkgs/os-specific/linux/fuse/common.nix @@ -4,6 +4,7 @@ , fusePackages, utillinux, gettext , autoconf, automake, libtool , meson, ninja, pkgconfig +, autoreconfHook }: let @@ -18,6 +19,8 @@ in stdenv.mkDerivation rec { sha256 = sha256Hash; }; + preAutoreconf = "touch config.rpath"; + patches = stdenv.lib.optional (!isFuse3 && stdenv.isAarch64) @@ -30,8 +33,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = if isFuse3 then [ meson ninja pkgconfig ] - else [ autoconf automake libtool ]; - buildInputs = stdenv.lib.optional (!isFuse3) gettext; + else [ autoreconfHook gettext ]; outputs = [ "out" ] ++ stdenv.lib.optional isFuse3 "common"; |