Unverified Commit 607cb893 authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

Merge pull request #254512 from rnhmjoj/pr-anbox 

anbox: always use postmarket OS images
parents c232fe0a 705b998b

nixos/tests/anbox.nix

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 


    virtualisation.anbox.enable = true;

    boot.kernelPackages = pkgs.linuxPackages_5_15;



    # The AArch64 anbox image will not start.

    # Meanwhile the postmarketOS images work just fine.

    virtualisation.anbox.image = pkgs.anbox.postmarketos-image;

    virtualisation.memorySize = 2500;

  };

pkgs/os-specific/linux/anbox/anbox-image.nix

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
{ stdenv, fetchurl }:



let

  imgroot = "https://build.anbox.io/android-images";

in

  {

    armv7l-linux = fetchurl {

      url = imgroot + "/2017/06/12/android_1_armhf.img";

      sha256 = "1za4q6vnj8wgphcqpvyq1r8jg6khz7v6b7h6ws1qkd5ljangf1w5";

    };

    aarch64-linux = fetchurl {

      url = imgroot + "/2017/08/04/android_1_arm64.img";

      sha256 = "02yvgpx7n0w0ya64y5c7bdxilaiqj9z3s682l5s54vzfnm5a2bg5";

    };

    x86_64-linux = fetchurl {

      url = imgroot + "/2018/07/19/android_amd64.img";

      sha256 = "1jlcda4q20w30cm9ikm6bjq01p547nigik1dz7m4v0aps4rws13b";

    };

  }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}")

pkgs/os-specific/linux/anbox/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -154,9 +154,7 @@ stdenv.mkDerivation rec { 
  '';



  passthru.tests = { inherit (nixosTests) anbox; };



  passthru.image = callPackage ./postmarketos-image.nix { };

  passthru.postmarketos-image = callPackage ./anbox-image.nix { };



  meta = with lib; {

    homepage = "https://anbox.io";