1
1
mirror of https://github.com/divnix/digga.git synced 2024-12-23 08:02:21 +03:00
This commit is contained in:
bors[bot] 2021-03-27 17:33:20 +00:00
parent 5b5a1d6fe4
commit 399243e54b
3 changed files with 13 additions and 8 deletions

View File

@ -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 =
@ -90,7 +93,7 @@
packages = lib.filterPackages system legacyPackages;
devShell = import ./shell {
inherit self system;
inherit self system extern overrides;
};
}
);

View File

@ -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 = [
(final: prev: {

View File

@ -1,8 +1,12 @@
{ self ? (import ../compat).defaultNix
, system ? builtins.currentSystem
, extern ? import ../extern { inherit (self) inputs; }
, overrides ? import ../overrides
}:
let
pkgs = (self.lib.os.mkPkgs).${system};
pkgs = (self.lib.os.mkPkgs {
inherit overrides extern;
}).${system};
inherit (pkgs) lib;