From 8a3548925c294662a1860375ed3e36b58436fdf8 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 21 Sep 2025 20:21:41 -0300 Subject: [PATCH] bash: fix cygwin build Co-authored-by: Brian McKenna --- pkgs/shells/bash/5.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index 015872e3b2f7..64d02ed4ff68 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -107,12 +107,9 @@ lib.warnIf (withDocs != null) }" ] ++ lib.optionals stdenv.hostPlatform.isCygwin [ - "--without-libintl-prefix" - "--without-libiconv-prefix" - "--with-installed-readline" "bash_cv_dev_stdin=present" "bash_cv_dev_fd=standard" - "bash_cv_termcap_lib=libncurses" + "gt_cv_func_printf_posix=yes" ] ++ lib.optionals (stdenv.hostPlatform.libc == "musl") [ "--disable-nls" @@ -136,15 +133,10 @@ lib.warnIf (withDocs != null) enableParallelBuilding = true; - makeFlags = lib.optionals stdenv.hostPlatform.isCygwin [ - "LOCAL_LDFLAGS=-Wl,--export-all,--out-implib,libbash.dll.a" - "SHOBJ_LIBS=-lbash" - ]; - doCheck = false; # Can't be enabled by default due to dependency cycle, use passthru.tests.withChecks instead postInstall = '' - ln -s bash "$out/bin/sh" + ln -s bash${stdenv.hostPlatform.extensions.executable} "$out/bin/sh" rm -f $out/lib/bash/Makefile.inc '';