nix-community/nix-on-droid
1
0
Fork 0
mirror of https://github.com/nix-community/nix-on-droid.git synced 2025-11-08 11:36:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci.nix: simplify to single arch

Browse source
This commit is contained in:
Alexander Sosedkin 2021-12-16 22:13:57 +01:00
parent 7aeb529aab
commit 9ee03e218d
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
ci.nix
View file

@ -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

2
pkgs/default.nix
View file

@ -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 { };