diff --git a/pkgs/by-name/aa/aapt/package.nix b/pkgs/by-name/aa/aapt/package.nix index c7767eebe559..7fa35b3f3942 100644 --- a/pkgs/by-name/aa/aapt/package.nix +++ b/pkgs/by-name/aa/aapt/package.nix @@ -52,11 +52,7 @@ stdenvNoCC.mkDerivation rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ linsui ]; teams = [ lib.teams.android ]; - platforms = lib.platforms.unix; - badPlatforms = [ - # The linux executable only supports x86_64 - "aarch64-linux" - ]; + platforms = lib.platforms.darwin ++ [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index c3b3324d098b..48613d736d09 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -209,11 +209,9 @@ python.pkgs.buildPythonApplication rec { ]) ++ lib.optionals enableBloat ( [ - aapt abootimg apksigcopier apksigner - apktool cbfstool colord enjarify @@ -257,6 +255,12 @@ python.pkgs.buildPythonApplication rec { ]) # oggvideotools is broken on Darwin, please put it back when it will be fixed? ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ] + # Causes an eval failure + # See https://github.com/NixOS/nixpkgs/issues/463873 + ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [ + aapt + apktool + ] ) );