From af4ad24d73d203618a177381027355e0b4a57c66 Mon Sep 17 00:00:00 2001
From: Sarah Brofeldt <sbrofeldt@gmail.com>
Date: Fri, 22 Mar 2019 23:27:26 +0100
Subject: anbox: Prevent eval failure on non-existent arches

---
 pkgs/os-specific/linux/anbox/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index bd85b6620ba..f192a028464 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -97,31 +97,28 @@ stdenv.mkDerivation rec {
 
   passthru.image = let
     imgroot = "https://build.anbox.io/android-images";
-    arches = {
-      armv7l-linux = {
+  in
+    {
+      armv7l-linux = fetchurl {
         url = imgroot + "/2017/06/12/android_1_armhf.img";
         sha256 = "1za4q6vnj8wgphcqpvyq1r8jg6khz7v6b7h6ws1qkd5ljangf1w5";
       };
-      aarch64-linux = {
+      aarch64-linux = fetchurl {
         url = imgroot + "/2017/08/04/android_1_arm64.img";
         sha256 = "02yvgpx7n0w0ya64y5c7bdxilaiqj9z3s682l5s54vzfnm5a2bg5";
       };
-      x86_64-linux = {
+      x86_64-linux = fetchurl {
         url = imgroot + "/2018/07/19/android_amd64.img";
         sha256 = "1jlcda4q20w30cm9ikm6bjq01p547nigik1dz7m4v0aps4rws13b";
       };
-    };
-  in
-  fetchurl {
-    inherit (arches.${stdenv.system}) url sha256;
-  };
+    }.${stdenv.system} or null;
 
   meta = with stdenv.lib; {
     homepage = https://anbox.io;
     description = "Android in a box.";
     license = licenses.gpl2;
     maintainers = with maintainers; [ edwtjo ];
-    platforms = platforms.linux;
+    platforms = [ "armv7l-linux" "aarch64-linux" "x86-64-linux" ];
   };
 
 }
-- 
cgit 1.4.1