Unverified Commit 3fe36f47 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #221481 from wegank/android-tools-fix 

android-tools: fix build on aarch64-linux
parents 95cb05fe a71ff66d

pkgs/top-level/all-packages.nix

+1 −4
Original line number Diff line number Diff line
@@ -2665,10 +2665,7 @@ with pkgs; 














  android-backup-extractor = callPackage ../tools/backup/android-backup-extractor { };



























  android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools













    (lib.optionalAttrs (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isLinux) {













      stdenv = gcc10Stdenv;













    }));













  android-tools = lowPrio (darwin.apple_sdk_11_0.callPackage ../tools/misc/android-tools { });





























  anewer = callPackage ../tools/text/anewer { };