From c9c0e7c1b0ad3bc7c74a241f01eea6cf02eeb92b Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sat, 6 Apr 2019 15:54:25 +0200 Subject: nilfs-utils: fix cross-compilation issue caused by AC_FUNC_MALLOC --- pkgs/tools/filesystems/nilfs-utils/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/filesystems/nilfs-utils/default.nix') diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index eccd72ceb238a..ea321200fb981 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -35,7 +35,13 @@ stdenv.mkDerivation rec { }) ]; - configureFlags = [ "--with-libmount" ]; + configureFlags = [ + "--with-libmount" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # AC_FUNC_MALLOC is broken on cross builds. + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; # FIXME: https://github.com/NixOS/patchelf/pull/98 is in, but stdenv # still doesn't use it -- cgit 1.4.1