From 0e2402e2883c577a60b9e944aa9ab328eb71ae43 Mon Sep 17 00:00:00 2001 From: pearl Date: Tue, 16 Apr 2024 23:55:15 -0400 Subject: [PATCH] androidenv: fix compose-android-packages on non-x86_64 environments This has always been possible, however the nix package previously checked against stdenv.system with only x86_64 architectures used. --- .../mobile/androidenv/compose-android-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index a0ab34cef33c..817fd4247633 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -27,8 +27,8 @@ let # Determine the Android os identifier from Nix's system identifier - os = if stdenv.system == "x86_64-linux" then "linux" - else if stdenv.system == "x86_64-darwin" then "macosx" + os = if stdenv.isLinux then "linux" + else if stdenv.isDarwin then "macosx" else throw "No Android SDK tarballs are available for system architecture: ${stdenv.system}"; # Uses mkrepo.rb to create a repo spec.