From ed5bd8ad4997424f492dedac45da9f57532c6827 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 27 Feb 2018 20:58:38 -0500 Subject: fuse: Fix cross-compilation --- pkgs/os-specific/linux/fuse/common.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'pkgs/os-specific') diff --git a/pkgs/os-specific/linux/fuse/common.nix b/pkgs/os-specific/linux/fuse/common.nix index b9ac015f4591..a10a4f466c7c 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"; -- cgit 1.4.1