mirror of
https://github.com/nix-community/nix-on-droid.git
synced 2025-11-08 19:46:07 +01:00
flake.nix: simplify to single arch
This commit is contained in:
parent
9ee03e218d
commit
e81bd1ae37
1 changed files with 9 additions and 13 deletions
22
flake.nix
22
flake.nix
|
|
@ -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;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue