From 9ee03e218d0b39e9168109156b15a161303997c9 Mon Sep 17 00:00:00 2001
From: Alexander Sosedkin <monk@unboiled.info>
Date: Thu, 16 Dec 2021 22:13:57 +0100
Subject: [PATCH] ci.nix: simplify to single arch

---
 ci.nix           | 9 ++-------
 pkgs/default.nix | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ci.nix b/ci.nix
index faae099..8917988 100644
--- a/ci.nix
+++ b/ci.nix
@@ -5,12 +5,7 @@ with import <nixpkgs> { };
 with lib;
 
 let
-  pkgs = import ./pkgs;
-
-  attrs = genAttrs
-    [ "aarch64" ]
-    (arch: (pkgs { inherit arch; }) // { recurseForDerivations = true; });
-
+  pkgs = (import ./pkgs {}) // { recurseForDerivations = true; };
   isCacheable = p: !(p.preferLocalBuild or false);
   shouldRecurseForDerivations = p: isAttrs p && p.recurseForDerivations or false;
 
@@ -23,7 +18,7 @@ let
     in
       concatMap f (attrValues s);
 
-  cachePkgs = filter isCacheable (flattenPkgs attrs);
+  cachePkgs = filter isCacheable (flattenPkgs pkgs);
 
   outputsOf = p: map (o: p.${o}) p.outputs;
 in
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 2f8ddb2..9bfac85 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,6 +1,6 @@
 # Copyright (c) 2019-2021, see AUTHORS. Licensed under MIT License, see LICENSE.
 
-{ arch, nixOnDroidChannelURL ? null, nixpkgsChannelURL ? null }:
+{ arch ? "aarch64", nixOnDroidChannelURL ? null, nixpkgsChannelURL ? null }:
 
 let
   nixDirectory = callPackage ./nix-directory.nix { };