diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2018-10-12 14:14:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 14:14:57 +0100 |
| commit | c6a82eae32764940c113622aa34e0422bb2e811d (patch) | |
| tree | 78e810b51a999ec9e541964e604af48d38b8dfe1 /pkgs | |
| parent | 5bd1b675c668cf249ebdeaf72ec6fe5b5f4fab00 (diff) | |
| parent | 0653da427ac4e75d2f5831e50b71bdb14769ef6c (diff) | |
| download | nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar.gz nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar.bz2 nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar.lz nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar.xz nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.tar.zst nixlib-c6a82eae32764940c113622aa34e0422bb2e811d.zip | |
Merge pull request #48268 from volth/patch-267
psmisc: fix cross-compiling
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/psmisc/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/psmisc/default.nix b/pkgs/os-specific/linux/psmisc/default.nix index 8b3906dedb1f..68e51afdf1bb 100644 --- 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 ''; |