public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libiconv, ncurses: Add optional flags for minimal android variant

Browse Source
This commit is contained in:
John Ericson 2018-02-20 18:23:00 -05:00
parent 2482e2858e
commit 3a672cb7d2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libiconv/default.nix
View File

@ -1,5 +1,6 @@
{ fetchurl, stdenv, lib { fetchurl, stdenv, lib
, buildPlatform, hostPlatform , buildPlatform, hostPlatform
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
}: }:
# assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross # assert !stdenv.isLinux || hostPlatform != buildPlatform; # TODO: improve on cross
@ -19,8 +20,8 @@ stdenv.mkDerivation rec {
sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
''; '';
configureFlags = configureFlags = lib.optional stdenv.isFreeBSD "--with-pic"
lib.optional stdenv.isFreeBSD "--with-pic"; ++ lib.optional enableStatic "--enable-static";
meta = { meta = {
description = "An iconv(3) implementation"; description = "An iconv(3) implementation";

4
pkgs/development/libraries/ncurses/default.nix
View File

@ -3,6 +3,8 @@
, abiVersion , abiVersion
, mouseSupport ? false , mouseSupport ? false
, unicode ? true , unicode ? true
, enableStatic ? stdenv.hostPlatform.useAndroidPrebuilt
, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
, gpm , gpm
@ -36,6 +38,8 @@ stdenv.mkDerivation rec {
"--enable-pc-files" "--enable-pc-files"
"--enable-symlinks" "--enable-symlinks"
] ++ lib.optional unicode "--enable-widec" ] ++ lib.optional unicode "--enable-widec"
++ lib.optional enableStatic "--enable-static"
++ lib.optional (!withCxx) "--without-cxx"
++ lib.optional (abiVersion == "5") "--with-abi-version=5"; ++ lib.optional (abiVersion == "5") "--with-abi-version=5";
# Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris: