axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

lib/mkPkgs: fix function arguments

Browse source 
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:
Pacman99 2021-03-26 09:54:37 -07:00
parent 4f38a88191
commit 562f476fb5
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
flake.nix
View file

@ -34,8 +34,11 @@
inherit (lib) os; inherit (lib) os;
extern = import ./extern { inherit inputs; }; extern = import ./extern { inherit inputs; };
overrides = import ./overrides;
multiPkgs = os.mkPkgs; multiPkgs = os.mkPkgs {
inherit extern overrides;
};
outputs = { outputs = {
nixosConfigurations = nixosConfigurations =

8
lib/devos/mkPkgs.nix
View file

@ -1,13 +1,11 @@
{ lib, dev, nixos, self, ... }: { lib, dev, nixos, self, inputs, ... }:
let inherit (self) inputs; { extern, overrides }:
in
(inputs.utils.lib.eachDefaultSystem (inputs.utils.lib.eachDefaultSystem
(system: (system:
let let
extern = import ../../extern { inherit inputs; };
overridePkgs = dev.os.pkgImport inputs.override [ ] system; overridePkgs = dev.os.pkgImport inputs.override [ ] system;
overridesOverlay = (import ../../overrides).packages; overridesOverlay = overrides.packages;
overlays = [ overlays = [
(overridesOverlay overridePkgs) (overridesOverlay overridePkgs)