From 13ddac02e00b36557c1d2f2db42e93abe0fc6c22 Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Thu, 8 Feb 2024 07:11:42 +0530 Subject: [PATCH] mach: fix shell.nix to actually include android pkgs (#31279) Fix issue with precedence due to which the android environment variables were being added to the output of mkDerivation instead of the input attribute set. Signed-off-by: Mukilan Thiyagarajan --- etc/shell.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/etc/shell.nix b/etc/shell.nix index 603e5ed493e..d77e66e9135 100644 --- a/etc/shell.nix +++ b/etc/shell.nix @@ -53,8 +53,14 @@ let ]; }; androidSdk = androidComposition.androidsdk; + # Required by ./mach build --android + androidEnvironment = lib.optionalAttrs buildAndroid rec { + ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; + ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; + GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2"; + }; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (androidEnvironment // rec { name = "servo-env"; buildInputs = [ @@ -214,9 +220,4 @@ stdenv.mkDerivation rec { export RUSTUP_HOME=$repo_root/.rustup fi ''; -} // lib.optionalAttrs buildAndroid { - # Required by ./mach build --android - ANDROID_SDK_ROOT = "${androidSdk}/libexec/android-sdk"; - ANDROID_NDK_ROOT = "${ANDROID_SDK_ROOT}/ndk-bundle"; - GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${ANDROID_SDK_ROOT}/build-tools/${buildToolsVersion}/aapt2"; -} +})