summary refs log tree commit diff
path: root/pkgs/development/libraries/ncurses/default.nix
diff options
context:
space:
mode:
authorTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
committerTuomas Tynkkynen <tuomas@tuxera.com>2018-02-28 20:52:49 +0200
commit34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852 (patch)
treed3e3546a41a812d151d1980cb8ee6808a8b8c7c6 /pkgs/development/libraries/ncurses/default.nix
parentad17db3562766979371f0ae9cc0d2428f44a9d58 (diff)
parentf1dd205c4e5ac28931ae8cdcde9d3c9a8ed2a0f5 (diff)
downloadnixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.gz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.bz2
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.lz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.xz
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.tar.zst
nixlib-34f95d92a2ca033fa25ae7ddcc7f5cb4b9e1f852.zip
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/misc/pytrainer/default.nix
	pkgs/development/tools/pew/default.nix
	pkgs/tools/misc/you-get/default.nix
Diffstat (limited to 'pkgs/development/libraries/ncurses/default.nix')
-rw-r--r--pkgs/development/libraries/ncurses/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 1524b265999b..abb3020e5fba 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -3,6 +3,8 @@
 , abiVersion
 , mouseSupport ? false
 , unicode ? true
+, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
+, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
 
 , gpm
 
@@ -30,6 +32,8 @@ stdenv.mkDerivation rec {
     "--enable-pc-files"
     "--enable-symlinks"
   ] ++ lib.optional unicode "--enable-widec"
+    ++ lib.optional enableStatic "--enable-static"
+    ++ lib.optional (!withCxx) "--without-cxx"
     ++ lib.optional (abiVersion == "5") "--with-abi-version=5";
 
   # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: