summary refs log tree commit diff
diff options
context:
space:
mode:
authorSamuel Dionne-Riel <samuel@dionne-riel.com>2021-06-03 22:28:09 -0400
committerrnhmjoj <rnhmjoj@inventati.org>2023-09-05 10:09:44 +0200
commiteaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5 (patch)
treeb21a14dc6128db7de90c8c9f0a59d0842fafcc7a
parent7425d9254ddbce7a8764a7e1cf8a6f2d30b812a9 (diff)
downloadnixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar.gz
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar.bz2
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar.lz
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar.xz
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.tar.zst
nixpkgs-eaa7d28b97e7e41c0c2e56fe0749fcf9fbd1a8e5.zip
anbox: add postmarketos image
-rw-r--r--pkgs/os-specific/linux/anbox/anbox-image.nix19
-rw-r--r--pkgs/os-specific/linux/anbox/default.nix20
-rw-r--r--pkgs/os-specific/linux/anbox/postmarketos-image.nix19
3 files changed, 41 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/anbox/anbox-image.nix b/pkgs/os-specific/linux/anbox/anbox-image.nix
new file mode 100644
index 00000000000..77bcd8a09f7
--- /dev/null
+++ b/pkgs/os-specific/linux/anbox/anbox-image.nix
@@ -0,0 +1,19 @@
+{ 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}")
diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index 515a89d6171..c178a3ddcdc 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchFromGitHub, fetchurl
+, callPackage
 , fetchpatch
 , cmake, pkg-config, dbus, makeWrapper
 , boost
@@ -151,23 +152,8 @@ stdenv.mkDerivation rec {
     chmod +x $out/bin/anbox-application-manager
   '';
 
-  passthru.image = 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 null;
+  passthru.image = callPackage ./postmarketos-image.nix { };
+  passthru.postmarketos-image = callPackage ./anbox-image.nix { };
 
   meta = with lib; {
     homepage = "https://anbox.io";
diff --git a/pkgs/os-specific/linux/anbox/postmarketos-image.nix b/pkgs/os-specific/linux/anbox/postmarketos-image.nix
new file mode 100644
index 00000000000..648a1a5ea9a
--- /dev/null
+++ b/pkgs/os-specific/linux/anbox/postmarketos-image.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let
+  imgroot = "https://web.archive.org/web/20211027150924/https://anbox.postmarketos.org";
+in
+  {
+    armv7l-linux = fetchurl {
+      url = imgroot + "/android-7.1.2_r39.1-anbox_armv7a_neon-userdebug.img";
+      sha256 = "1bgzqw4yp52a2q40dr1jlay1nh73jl5mx6wqsxvpb09xghxsng0a";
+    };
+    aarch64-linux = fetchurl {
+      url = imgroot + "/android-7.1.2_r39-anbox_arm64-userdebug.img";
+      sha256 = "0dx8mhfcjbkak982zfh65bvy35slz5jk31yl4ara50ryrxsp32nx";
+    };
+    x86_64-linux = fetchurl {
+      url = imgroot + "/android-7.1.2_r39-anbox_x86_64-userdebug.img";
+      sha256 = "16vmiz5al2r19wjpd44nagvz7d901ljxdms8gjp2w4xz1d91vzpm";
+    };
+  }.${stdenv.system} or (throw "Unsupported platform ${stdenv.system}")