Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5ac6ab091a48
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bbef861e0f48
Choose a head ref
  • 5 commits
  • 3 files changed
  • 2 contributors

Commits on Jun 22, 2018

  1. androidndk: fixup

    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    e5d262e View commit details

  2. androidndk: use unzip 

    This is a free version and preferred to 7zip.
    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    a7fc8ad View commit details

  3. androidndk: reduce output sizw 

    Fixes #41704
    @matthewbauer
    matthewbauer committed Jun 22, 2018
    4
    Copy the full SHA
    054656a View commit details

  4. androidndk: fix eval

    @matthewbauer
    matthewbauer committed Jun 22, 2018
    Copy the full SHA
    7b49d3b View commit details

  5. Merge pull request #42397 from obsidiansystems/more-android-fixes 

    androidndk: cleanups
    @Ericson2314
    Ericson2314 authored Jun 22, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    bbef861 View commit details
18 changes: 10 additions & 8 deletions pkgs/development/mobile/androidenv/androidndk.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, zlib, ncurses5, p7zip, lib, makeWrapper
{ stdenv, fetchurl, zlib, ncurses5, unzip, lib, makeWrapper
, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which
, platformTools, python3, libcxx, version, sha256
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {

phases = "buildPhase";

nativeBuildInputs = [ p7zip makeWrapper file ];
nativeBuildInputs = [ unzip makeWrapper file ];

buildCommand = let
bin_path = "$out/bin";
@@ -32,11 +32,13 @@ stdenv.mkDerivation rec {
]) + ":${platformTools}/platform-tools";
in ''
mkdir -pv $out/libexec
mkdir -pv $out/lib64
ln -s ${ncurses5.out}/lib/libncursesw.so.5 $out/lib64/libtinfo.so.5
ln -s ${ncurses5.out}/lib/libncurses.so.5 $out/lib64/libncurses.so.5
cd $out/libexec
7z x $src
unzip -qq $src
# Steps to reduce output size
rm -rf docs sources tests
# We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm-*
patchShebangs ${pkg_path}
@@ -58,11 +60,11 @@ stdenv.mkDerivation rec {
}
cd ${pkg_path}
find $out \( \
find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
--set-rpath $out/lib64:${stdenv.lib.makeLibraryPath [ libcxx.out zlib.out ncurses5 ]} {} \;
--set-rpath ${stdenv.lib.makeLibraryPath [ libcxx zlib ncurses5 ]} {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ${lib.optionalString (version == "10e") "ndk-gdb ndk-gdb-py"}
do
7 changes: 6 additions & 1 deletion pkgs/development/mobile/androidenv/androidndk_r8e.nix
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,12 @@ stdenv.mkDerivation rec {
-d $out/libexec/${name} < ${ ./make-standalone-toolchain_r8e.patch }
cd ${pkg_path}
find $out \( \
# Steps to reduce output size
rm -rf docs sources tests
# We only support cross compiling with gcc for now
rm -rf toolchains/*-clang* toolchains/llvm-*
find ${pkg_path}/toolchains \( \
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
6 changes: 3 additions & 3 deletions pkgs/development/mobile/androidenv/default.nix
View file
Original file line number Diff line number Diff line change
@@ -226,7 +226,7 @@ rec {

androidndk_10e = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@@ -237,7 +237,7 @@ rec {

androidndk_16b = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;
@@ -248,7 +248,7 @@ rec {

androidndk_17 = import ./androidndk.nix {
inherit (buildPackages)
p7zip makeWrapper;
unzip makeWrapper;
inherit (pkgs)
stdenv fetchurl zlib ncurses5 lib python3 libcxx
coreutils file findutils gawk gnugrep gnused jdk which;