From 33eec8e105359b1c01490f64f02057bf75a90c09 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Tue, 23 May 2017 10:36:07 -0300 Subject: [PATCH] ncurses: fix cygwin build --- pkgs/development/libraries/ncurses/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 46283e371aa..827a556a468 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -61,8 +61,6 @@ stdenv.mkDerivation rec { -e '/CPPFLAGS="$CPPFLAGS/s/ -D_XOPEN_SOURCE_EXTENDED//' \ configure CFLAGS=-D_XOPEN_SOURCE_EXTENDED - '' + lib.optionalString stdenv.isCygwin '' - sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure ''; enableParallelBuilding = true; @@ -122,7 +120,7 @@ stdenv.mkDerivation rec { moveToOutput "bin/tset" "$out" ''; - preFixup = '' + preFixup = lib.optionalString (!hostPlatform.isCygwin) '' rm "$out"/lib/*.a '';