ncurses: Fix for cross
This commit is contained in:
parent
76667036ec
commit
8ad2c6a830
@ -5,6 +5,9 @@
|
|||||||
, unicode ? true
|
, unicode ? true
|
||||||
|
|
||||||
, gpm
|
, gpm
|
||||||
|
|
||||||
|
, buildPlatform, hostPlatform
|
||||||
|
, buildPackages
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
version = if abiVersion == "5" then "5.9" else "6.0";
|
version = if abiVersion == "5" then "5.9" else "6.0";
|
||||||
@ -35,7 +38,11 @@ stdenv.mkDerivation rec {
|
|||||||
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
|
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
|
||||||
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
|
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [
|
||||||
|
pkgconfig
|
||||||
|
] ++ lib.optionals (buildPlatform != hostPlatform) [
|
||||||
|
buildPackages.ncurses buildPackages.stdenv.cc
|
||||||
|
];
|
||||||
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
|
buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
|
||||||
|
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
@ -58,7 +65,8 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
|
sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
|
||||||
'';
|
'';
|
||||||
|
|
||||||
selfNativeBuildInput = true;
|
# Here only for native hash, remove on next mass rebuild
|
||||||
|
selfNativeBuildInput = buildPlatform == hostPlatform;
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user