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

androidndk: add fullNDK option

Browse Source 
Setting this to true will disable removing some of the unused parts of
the NDK toolchain that is unused in Nixpkgs but may be used by others.

/cc @bkchr
This commit is contained in:
Matthew Bauer 2018-06-24 16:42:10 -04:00
parent 7652b2ef16
commit d9155904b3
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/mobile/androidenv/androidndk.nix
View File

@ -1,6 +1,9 @@
{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper { stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
, platformTools, python3, libcxx, version, sha256 , platformTools, python3, libcxx, version, sha256
, fullNDK ? false # set to true if you want other parts of the NDK
# that is not used by Nixpkgs like sources,
# examples, docs, or LLVM toolchains
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -55,11 +58,14 @@ stdenv.mkDerivation rec {
} }
cd ${pkg_path} cd ${pkg_path}
'' + lib.optionalString (!fullNDK) ''
# Steps to reduce output size # Steps to reduce output size
rm -rf docs sources tests rm -rf docs sources tests
# We only support cross compiling with gcc for now # We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm* rm -rf toolchains/*-clang* toolchains/llvm*
'' +
''
find ${pkg_path}/toolchains \( \ find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \ \( -type f -a -perm -0100 \) \

5
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View File

@ -1,6 +1,9 @@
{ stdenv, fetchurl, zlib, ncurses, lib, makeWrapper { stdenv, fetchurl, zlib, ncurses, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which , coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
, platformTools , platformTools
, fullNDK ? false # set to true if you want other parts of the NDK
# that is not used by Nixpkgs like sources,
# examples, docs, or LLVM toolchains
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -49,11 +52,13 @@ stdenv.mkDerivation rec {
-d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch } -d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
cd ${pkg_path} cd ${pkg_path}
'' + lib.optionalString (!fullNDK) ''
# Steps to reduce output size # Steps to reduce output size
rm -rf docs sources tests rm -rf docs sources tests
# We only support cross compiling with gcc for now # We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm-* rm -rf toolchains/*-clang* toolchains/llvm-*
'' + ''
find ${pkg_path}/toolchains \( \ find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \ \( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \ \( -type f -a -perm -0100 \) \