about summary refs log tree commit diff
path: root/pkgs/tools/filesystems/nilfs-utils/default.nix
diff options
context:
space:
mode:
authorPierre Bourdon <delroth@gmail.com>2019-04-06 15:54:25 +0200
committerPierre Bourdon <delroth@gmail.com>2019-04-06 15:55:50 +0200
commitc9c0e7c1b0ad3bc7c74a241f01eea6cf02eeb92b (patch)
tree63a7276002727bae194c234f2c274240b3db91cd /pkgs/tools/filesystems/nilfs-utils/default.nix
parent57de25b3193b4c5436656b0154f4360bd2b250e7 (diff)
nilfs-utils: fix cross-compilation issue caused by AC_FUNC_MALLOC
Diffstat (limited to 'pkgs/tools/filesystems/nilfs-utils/default.nix')
-rw-r--r--pkgs/tools/filesystems/nilfs-utils/default.nix8
1 files changed, 7 insertions, 1 deletions
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