androidenv: update to latest
This commit is contained in:
parent
39abaaa2e8
commit
a10fada751
|
@ -2,12 +2,12 @@
|
||||||
, licenseAccepted ? false
|
, licenseAccepted ? false
|
||||||
}:
|
}:
|
||||||
|
|
||||||
{ cmdLineToolsVersion ? "11.0"
|
{ cmdLineToolsVersion ? "13.0"
|
||||||
, toolsVersion ? "26.1.1"
|
, toolsVersion ? "26.1.1"
|
||||||
, platformToolsVersion ? "34.0.5"
|
, platformToolsVersion ? "35.0.1"
|
||||||
, buildToolsVersions ? [ "34.0.0" ]
|
, buildToolsVersions ? [ "34.0.0" ]
|
||||||
, includeEmulator ? false
|
, includeEmulator ? false
|
||||||
, emulatorVersion ? "34.1.9"
|
, emulatorVersion ? "35.1.4"
|
||||||
, platformVersions ? []
|
, platformVersions ? []
|
||||||
, includeSources ? false
|
, includeSources ? false
|
||||||
, includeSystemImages ? false
|
, includeSystemImages ? false
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]
|
, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ]
|
||||||
, cmakeVersions ? [ ]
|
, cmakeVersions ? [ ]
|
||||||
, includeNDK ? false
|
, includeNDK ? false
|
||||||
, ndkVersion ? "26.1.10909125"
|
, ndkVersion ? "26.3.11579264"
|
||||||
, ndkVersions ? [ndkVersion]
|
, ndkVersions ? [ndkVersion]
|
||||||
, useGoogleAPIs ? false
|
, useGoogleAPIs ? false
|
||||||
, useGoogleTVAddOns ? false
|
, useGoogleTVAddOns ? false
|
||||||
|
|
|
@ -9,9 +9,12 @@ deployAndroidPackage {
|
||||||
libcxx
|
libcxx
|
||||||
libGL
|
libGL
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
|
libtiff
|
||||||
libuuid
|
libuuid
|
||||||
zlib
|
zlib
|
||||||
|
libbsd
|
||||||
ncurses5
|
ncurses5
|
||||||
|
libdrm
|
||||||
stdenv.cc.cc
|
stdenv.cc.cc
|
||||||
pkgsi686Linux.glibc
|
pkgsi686Linux.glibc
|
||||||
expat
|
expat
|
||||||
|
@ -30,6 +33,9 @@ deployAndroidPackage {
|
||||||
libXi
|
libXi
|
||||||
libXrender
|
libXrender
|
||||||
libXtst
|
libXtst
|
||||||
|
libICE
|
||||||
|
libSM
|
||||||
|
libxkbfile
|
||||||
]);
|
]);
|
||||||
patchInstructions = lib.optionalString (os == "linux") ''
|
patchInstructions = lib.optionalString (os == "linux") ''
|
||||||
addAutoPatchelfSearchPath $packageBaseDir/lib
|
addAutoPatchelfSearchPath $packageBaseDir/lib
|
||||||
|
@ -37,6 +43,12 @@ deployAndroidPackage {
|
||||||
addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
|
addAutoPatchelfSearchPath $packageBaseDir/lib64/qt/lib
|
||||||
# autoPatchelf is not detecting libuuid :(
|
# autoPatchelf is not detecting libuuid :(
|
||||||
addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
|
addAutoPatchelfSearchPath ${pkgs.libuuid.out}/lib
|
||||||
|
|
||||||
|
# This library is linked against a version of libtiff that nixpkgs doesn't have
|
||||||
|
for file in $out/libexec/android-sdk/emulator/*/qt/plugins/imageformats/libqtiffAndroidEmu.so; do
|
||||||
|
patchelf --replace-needed libtiff.so.5 libtiff.so "$file" || true
|
||||||
|
done
|
||||||
|
|
||||||
autoPatchelf $out
|
autoPatchelf $out
|
||||||
|
|
||||||
# Wrap emulator so that it can load required libraries at runtime
|
# Wrap emulator so that it can load required libraries at runtime
|
||||||
|
|
|
@ -25,14 +25,14 @@ let
|
||||||
# versions may be used in multiple places in this Nix expression.
|
# versions may be used in multiple places in this Nix expression.
|
||||||
android = {
|
android = {
|
||||||
versions = {
|
versions = {
|
||||||
cmdLineToolsVersion = "11.0";
|
cmdLineToolsVersion = "13.0";
|
||||||
platformTools = "34.0.5";
|
platformTools = "35.0.1";
|
||||||
buildTools = "34.0.0";
|
buildTools = "34.0.0";
|
||||||
ndk = [
|
ndk = [
|
||||||
"26.1.10909125"
|
"26.3.11579264"
|
||||||
];
|
];
|
||||||
cmake = "3.6.4111459";
|
cmake = "3.6.4111459";
|
||||||
emulator = "34.1.9";
|
emulator = "35.1.4";
|
||||||
};
|
};
|
||||||
|
|
||||||
platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
|
platforms = [ "23" "24" "25" "26" "27" "28" "29" "30" "31" "32" "33" "34" ];
|
||||||
|
|
|
@ -11,8 +11,8 @@ deployAndroidPackage rec {
|
||||||
inherit package os;
|
inherit package os;
|
||||||
nativeBuildInputs = [ makeWrapper ]
|
nativeBuildInputs = [ makeWrapper ]
|
||||||
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
++ lib.optionals stdenv.isLinux [ autoPatchelfHook ];
|
||||||
autoPatchelfIgnoreMissingDeps = true;
|
autoPatchelfIgnoreMissingDeps = [ "*" ];
|
||||||
buildInputs = lib.optionals (os == "linux") [ pkgs.zlib ];
|
buildInputs = lib.optionals (os == "linux") [ pkgs.zlib pkgs.libcxx stdenv.cc.cc.lib ];
|
||||||
|
|
||||||
patchElfBnaries = ''
|
patchElfBnaries = ''
|
||||||
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
|
# Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user