mirror of
https://github.com/nix-community/nix-on-droid.git
synced 2025-11-09 03:56:06 +01:00
flake.nix: Clean up, allow overriding pkgs
`outputs.overlays` is supposed to be an attribute set of overlays, and `outputs.overlay` should contain a single overlay.
This commit is contained in:
parent
b1086df532
commit
0b83ab6bf1
1 changed files with 19 additions and 27 deletions
34
flake.nix
34
flake.nix
|
|
@ -9,32 +9,24 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, home-manager, flake-utils }:
|
outputs = { self, nixpkgs, home-manager, flake-utils }: let
|
||||||
{
|
supportedSystems = [ "aarch64-linux" "i686-linux" ];
|
||||||
overlays = import ./overlays;
|
in flake-utils.lib.eachSystem supportedSystems (system: let
|
||||||
} //
|
defaultPkgs = import nixpkgs {
|
||||||
flake-utils.lib.eachSystem [
|
|
||||||
"aarch64-linux"
|
|
||||||
"i686-linux"
|
|
||||||
]
|
|
||||||
(system:
|
|
||||||
let pkgs = import nixpkgs {
|
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = self.overlays;
|
overlays = [ self.overlay ];
|
||||||
}; in
|
|
||||||
rec {
|
|
||||||
lib = {
|
|
||||||
nix-on-droid = { config }: import ./modules {
|
|
||||||
inherit pkgs config;
|
|
||||||
isFlake = true;
|
|
||||||
home-manager = (import home-manager { });
|
|
||||||
};
|
};
|
||||||
|
in rec {
|
||||||
|
lib.nix-on-droid = { pkgs ? defaultPkgs, config }: import ./modules {
|
||||||
|
inherit pkgs home-manager config;
|
||||||
|
isFlake = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
apps.nix-on-droid = flake-utils.lib.mkApp {
|
apps.nix-on-droid = flake-utils.lib.mkApp {
|
||||||
drv = (pkgs.callPackage ./nix-on-droid { });
|
drv = (defaultPkgs.callPackage ./nix-on-droid { });
|
||||||
};
|
};
|
||||||
defaultApp = apps.nix-on-droid;
|
defaultApp = apps.nix-on-droid;
|
||||||
}
|
}) // {
|
||||||
);
|
overlay = nixpkgs.lib.composeManyExtensions (import ./overlays);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue