Merge pull request #48268 from volth/patch-267

psmisc: fix cross-compiling
2018-10-12 14:14:57 +01:00
parent 5bd1b675c6 0653da427a
commit c6a82eae32
1 changed files with 5 additions and 1 deletions
--- a/pkgs/os-specific/linux/psmisc/default.nix
+++ b/pkgs/os-specific/linux/psmisc/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ autoconf automake gettext ];
  buildInputs = [ ncurses ];

-  preConfigure = ''
+  preConfigure = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
+    # Goes past the rpl_malloc linking failure
+    export ac_cv_func_malloc_0_nonnull=yes
+    export ac_cv_func_realloc_0_nonnull=yes
+  '' + ''
    echo $version > .tarball-version
    ./autogen.sh
  '';