lib/mkPkgs: fix function arguments
take extern and overrides as arguments as to not import external files get inputs as a function dependency from callLib
This commit is contained in:
parent
4f38a88191
commit
562f476fb5
|
@ -34,8 +34,11 @@
|
|||
inherit (lib) os;
|
||||
|
||||
extern = import ./extern { inherit inputs; };
|
||||
overrides = import ./overrides;
|
||||
|
||||
multiPkgs = os.mkPkgs;
|
||||
multiPkgs = os.mkPkgs {
|
||||
inherit extern overrides;
|
||||
};
|
||||
|
||||
outputs = {
|
||||
nixosConfigurations =
|
||||
|
|
|
@ -1,13 +1,11 @@
|
|||
{ lib, dev, nixos, self, ... }:
|
||||
{ lib, dev, nixos, self, inputs, ... }:
|
||||
|
||||
let inherit (self) inputs;
|
||||
in
|
||||
{ extern, overrides }:
|
||||
(inputs.utils.lib.eachDefaultSystem
|
||||
(system:
|
||||
let
|
||||
extern = import ../../extern { inherit inputs; };
|
||||
overridePkgs = dev.os.pkgImport inputs.override [ ] system;
|
||||
overridesOverlay = (import ../../overrides).packages;
|
||||
overridesOverlay = overrides.packages;
|
||||
|
||||
overlays = [
|
||||
(overridesOverlay overridePkgs)
|
||||
|
|
Loading…
Reference in a new issue