diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-25 23:52:29 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-05-17 17:50:05 -0400 |
| commit | 8ad2c6a830784bdc37a04f349ec5f13a1b16edee (patch) | |
| tree | b99e39a610f79bb49c72de4808938d28d8db6691 | |
| parent | 76667036ecb84d299424d0cba345b83040e869ae (diff) | |
| download | nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar.gz nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar.bz2 nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar.lz nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar.xz nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.tar.zst nixpkgs-8ad2c6a830784bdc37a04f349ec5f13a1b16edee.zip | |
ncurses: Fix for cross
| -rw-r--r-- | pkgs/development/libraries/ncurses/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 4ffaee9be5a..9e7f2eef46b 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -5,6 +5,9 @@ , unicode ? true , gpm + +, buildPlatform, hostPlatform +, buildPackages }: let 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: 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; preConfigure = '' @@ -58,7 +65,8 @@ stdenv.mkDerivation rec { 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; |