mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 08:01:31 +00:00
[Backport release-25.11] diffoscope: fix aarch64-linux eval (#533711)
This commit is contained in:
@@ -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 ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -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
|
||||
]
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user