Commit 85dc823b authored by Jeremy Kolb's avatar Jeremy Kolb
Browse files

ncurses: fix splicing 



Fixes warnings with #263082 applied

Update pkgs/development/libraries/ncurses/default.nix

Co-authored-by: default avatarArtturi <Artturin@artturin.com>

ncurses: Explicitly use buildPackages for --with-build-cc

stdenv.cc worked for me because my nixos was configured to use boot.binfmt.emulatedSystems.
parent b4c0c733

pkgs/development/libraries/ncurses/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
, stdenv

, fetchurl

, buildPackages

, ncurses

, pkg-config

, abiVersion ? "6"

, enableStatic ? stdenv.hostPlatform.isStatic
@@ -48,20 +49,20 @@ stdenv.mkDerivation (finalAttrs: { 
        "/usr/share/terminfo" # upstream default, probably all FHS-based distros

        "/run/current-system/sw/share/terminfo" # NixOS

      ]}"

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    "--with-build-cc=${buildPackages.stdenv.cc}/bin/${buildPackages.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

   # for `tic`, build already depends on for build `cc` so it's weird the build doesn't just build `tic`.

    ncurses

  ];



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