diff options
| author | volth <volth@webmaster.ms> | 2018-10-12 13:03:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-12 13:03:50 +0000 |
| commit | 0653da427ac4e75d2f5831e50b71bdb14769ef6c (patch) | |
| tree | 2cacf54f4a723400d4a0071bf935c27818bc389d | |
| parent | f3dd3b6afa18236fe878f0aad96e82245c09ebc2 (diff) | |
| download | nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar.gz nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar.bz2 nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar.lz nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar.xz nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.tar.zst nixpkgs-0653da427ac4e75d2f5831e50b71bdb14769ef6c.zip | |
psmisc: fix cross-compiling
| -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 8b3906dedb1..68e51afdf1b 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 ''; |