Skip to content

Commit

Permalink
ncurses: fix splicing
Browse files Browse the repository at this point in the history
Fixes warnings with #263082 applied
  • Loading branch information
kjeremy committed Nov 2, 2023
1 parent 60ffc2a commit 378476d
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions pkgs/development/libraries/ncurses/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchurl
, buildPackages
, ncurses
, pkg-config
, abiVersion ? "6"
, enableStatic ? stdenv.hostPlatform.isStatic
Expand Down Expand Up @@ -48,20 +48,17 @@ stdenv.mkDerivation (finalAttrs: {
"/usr/share/terminfo" # upstream default, probably all FHS-based distros
"/run/current-system/sw/share/terminfo" # NixOS
]}"
];
] ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "--with-build-cc=${stdenv.cc.targetPrefix}cc";

# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";

strictDeps = true;
depsBuildBuild = [
buildPackages.stdenv.cc
];

nativeBuildInputs = [
pkg-config
] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
buildPackages.ncurses
ncurses
];

buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
Expand Down

0 comments on commit 378476d

Please sign in to comment.