diff --git a/flake.nix b/flake.nix index 082f501..a4c648c 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = diff --git a/lib/devos/mkPkgs.nix b/lib/devos/mkPkgs.nix index 9b76e6d..fba62a1 100644 --- a/lib/devos/mkPkgs.nix +++ b/lib/devos/mkPkgs.nix @@ -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)