flake.nix: simplify to single arch

This commit is contained in:
Alexander Sosedkin 2021-12-16 22:14:32 +01:00
parent 9ee03e218d
commit e81bd1ae37

View file

@ -13,13 +13,13 @@
let let
overlay = nixpkgs.lib.composeManyExtensions (import ./overlays); overlay = nixpkgs.lib.composeManyExtensions (import ./overlays);
pkgsPerSystem = system: import nixpkgs { pkgs' = import nixpkgs {
inherit system; system = "aarch64-linux";
overlays = [ overlay ]; overlays = [ overlay ];
}; };
appPerSystem = system: flake-utils.lib.mkApp { app = flake-utils.lib.mkApp {
drv = (pkgsPerSystem system).callPackage ./nix-on-droid { }; drv = pkgs'.callPackage ./nix-on-droid { };
}; };
in in
{ {
@ -27,21 +27,17 @@
lib.nixOnDroidConfiguration = lib.nixOnDroidConfiguration =
{ config { config
, system , system ? "aarch64-linux" # unused
, extraModules ? [ ] , extraModules ? [ ]
, extraSpecialArgs ? { } , extraSpecialArgs ? { }
, pkgs ? pkgsPerSystem system , pkgs ? pkgs'
, home-manager-path ? home-manager.outPath , home-manager-path ? home-manager.outPath
}: }:
import ./modules { import ./modules {
inherit config extraModules extraSpecialArgs home-manager-path pkgs; inherit config extraModules extraSpecialArgs home-manager-path pkgs;
isFlake = true; isFlake = true;
}; };
} apps.nix-on-droid.aarch64-linux = app;
// flake-utils.lib.eachSystem defaultApp.aarch64-linux = app;
[ "aarch64-linux" ] };
(system: {
apps.nix-on-droid = appPerSystem system;
defaultApp = appPerSystem system;
});
} }