diff options
Diffstat (limited to 'nixpkgs/pkgs/development/mobile/androidenv')
10 files changed, 30 insertions, 151 deletions
diff --git a/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix index e648c83fa17..536a025d15b 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/build-tools.nix @@ -3,7 +3,7 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper ] ++ - lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 ]; + lib.optionals (os == "linux") [ pkgs.glibc pkgs.zlib pkgs.ncurses5 pkgs_i686.glibc pkgs_i686.zlib pkgs_i686.ncurses5 pkgs.libcxx ]; patchInstructions = '' ${lib.optionalString (os == "linux") '' addAutoPatchelfSearchPath $packageBaseDir/lib diff --git a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index f98547011bd..794de227664 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -1,4 +1,4 @@ -{requireFile, autoPatchelfHook, pkgs, pkgs_i686, licenseAccepted ? false}: +{requireFile, autoPatchelfHook, pkgs, pkgsHostHost, pkgs_i686, licenseAccepted ? false}: { toolsVersion ? "25.2.5" , platformToolsVersion ? "29.0.6" @@ -14,7 +14,7 @@ , lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "18.1.5063045" +, ndkVersion ? "21.0.6113669" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] @@ -144,7 +144,7 @@ rec { ) cmakeVersions; ndk-bundle = import ./ndk-bundle { - inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs lib platform-tools; + inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools; package = packages.ndk-bundle.${ndkVersion}; }; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl index 73f58ff5cde..20f007eca04 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl +++ b/nixpkgs/pkgs/development/mobile/androidenv/convertaddons.xsl @@ -36,13 +36,13 @@ archives = { <xsl:for-each select="archives/archive[not(host-os)]"> all = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> <xsl:value-of select="host-os" /> = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> @@ -60,13 +60,13 @@ archives = { <xsl:for-each select="archives/archive[not(host-os)]"> all = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> <xsl:value-of select="host-os" /> = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> @@ -108,13 +108,13 @@ archives = { <xsl:for-each select="archives/archive[not(host-os)]"> all = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> <xsl:value-of select="host-os" /> = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl index 5c36deb73c0..edc9074a898 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl +++ b/nixpkgs/pkgs/development/mobile/androidenv/convertpackages.xsl @@ -98,13 +98,13 @@ archives = { <xsl:for-each select="archives/archive[not(host-os)]"> all = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = !<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> <xsl:for-each select="archives/archive[host-os and not(host-os = 'windows')]"> <xsl:value-of select="host-os" /> = fetchurl { - url = <xsl:call-template name="repository-url"/>; + url = "<xsl:call-template name="repository-url"/>"; sha1 = "<xsl:value-of select="complete/checksum" />"; }; </xsl:for-each> diff --git a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl index de57041f192..947950badb4 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl +++ b/nixpkgs/pkgs/development/mobile/androidenv/convertsystemimages.xsl @@ -64,7 +64,7 @@ displayName = "</xsl:text><xsl:value-of select="display-name" /><xsl:text>"; archives.all = fetchurl {</xsl:text> <xsl:for-each select="archives/archive"><xsl:text> - url = </xsl:text><xsl:call-template name="repository-url"/><xsl:text>; + url = "</xsl:text><xsl:call-template name="repository-url"/><xsl:text>"; sha1 = "</xsl:text><xsl:value-of select="complete/checksum" /><xsl:text>";</xsl:text> </xsl:for-each><xsl:text> }; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/default.nix index 14882bc2243..a13b98cf945 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs ? import <nixpkgs> {} +{ config, pkgs ? import <nixpkgs> {}, pkgsHostHost ? pkgs.pkgsHostHost , pkgs_i686 ? import <nixpkgs> { system = "i686-linux"; } , licenseAccepted ? config.android_sdk.accept_license or false }: @@ -6,7 +6,7 @@ rec { composeAndroidPackages = import ./compose-android-packages.nix { inherit (pkgs) requireFile autoPatchelfHook; - inherit pkgs pkgs_i686 licenseAccepted; + inherit pkgs pkgsHostHost pkgs_i686 licenseAccepted; }; buildApp = import ./build-app.nix { @@ -15,7 +15,7 @@ rec { }; emulateApp = import ./emulate-app.nix { - inherit (pkgs) stdenv lib; + inherit (pkgs) stdenv lib runtimeShell; inherit composeAndroidPackages; }; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix index 839a14f7033..4f9db98c006 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/deploy-androidpackage.nix @@ -5,7 +5,8 @@ let extraParams = removeAttrs args [ "package" "os" "buildInputs" "patchInstructions" ]; in stdenv.mkDerivation ({ - name = package.name + "-" + package.revision; + pname = package.name; + version = package.revision; src = if os != null && builtins.hasAttr os package.archives then package.archives.${os} else package.archives.all; buildInputs = [ unzip ] ++ buildInputs; preferLocalBuild = true; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix index 6273d75cc38..83be06a3141 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/emulate-app.nix @@ -1,4 +1,4 @@ -{ composeAndroidPackages, stdenv, lib }: +{ composeAndroidPackages, stdenv, lib, runtimeShell }: { name, app ? null , platformVersion ? "16", abiVersion ? "armeabi-v7a", systemImageType ? "default" , enableGPU ? false, extraAVDFiles ? [] @@ -25,7 +25,7 @@ stdenv.mkDerivation { mkdir -p $out/bin cat > $out/bin/run-test-emulator << "EOF" - #! ${stdenv.shell} -e + #!${runtimeShell} -e # We need a TMPDIR if [ "$TMPDIR" = "" ] diff --git a/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix b/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix index 23a55595cce..231e5b8ea22 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/generated/addons.nix @@ -672,70 +672,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; - sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; @@ -896,70 +832,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; - sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; diff --git a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b81fab1ed76..ca305e0398d 100644 --- a/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -1,18 +1,24 @@ -{deployAndroidPackage, lib, package, os, autoPatchelfHook, makeWrapper, pkgs, platform-tools}: +{ lib, pkgs, pkgsHostHost, makeWrapper, autoPatchelfHook +, deployAndroidPackage, package, os, platform-tools +}: let - runtime_paths = lib.makeBinPath [ pkgs.coreutils pkgs.file pkgs.findutils pkgs.gawk pkgs.gnugrep pkgs.gnused pkgs.jdk pkgs.python3 pkgs.which ] + ":${platform-tools}/platform-tools"; + runtime_paths = lib.makeBinPath (with pkgsHostHost; [ + coreutils file findutils gawk gnugrep gnused jdk python3 which + ]) + ":${platform-tools}/platform-tools"; in deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + '' # TODO: allow this stuff rm -rf docs tests @@ -46,6 +52,6 @@ deployAndroidPackage { do ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done - ''; + ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } |