mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
anbox: always use postmarket OS images
This commit is contained in:
parent
bf58d13eca
commit
705b998b83
|
@ -16,10 +16,6 @@
|
||||||
|
|
||||||
virtualisation.anbox.enable = true;
|
virtualisation.anbox.enable = true;
|
||||||
boot.kernelPackages = pkgs.linuxPackages_5_15;
|
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;
|
virtualisation.memorySize = 2500;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
{ 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}")
|
|
|
@ -154,9 +154,7 @@ stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) anbox; };
|
passthru.tests = { inherit (nixosTests) anbox; };
|
||||||
|
|
||||||
passthru.image = callPackage ./postmarketos-image.nix { };
|
passthru.image = callPackage ./postmarketos-image.nix { };
|
||||||
passthru.postmarketos-image = callPackage ./anbox-image.nix { };
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
homepage = "https://anbox.io";
|
homepage = "https://anbox.io";
|
||||||
|
|
Loading…
Reference in a new issue