Unverified Commit af2e9c1e authored by @mjones's avatar @mjones Committed by GitHub
Browse files

diffoscope: fix aarch64-linux eval (#463877)

parents 9fa17032 00bca9c4

pkgs/by-name/aa/aapt/package.nix

+1 −5
Original line number Diff line number Diff line
@@ -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 ];

  };

}

pkgs/by-name/di/diffoscope/package.nix

+6 −2
Original line number Diff line number Diff line
@@ -211,11 +211,9 @@ python.pkgs.buildPythonApplication rec { 
    ])

    ++ lib.optionals enableBloat (

      [

        aapt

        abootimg

        apksigcopier

        apksigner

        apktool

        cbfstool

        colord

        enjarify
@@ -259,6 +257,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

      ]

    )

  );