matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: take into account the rest of config.nixpkgs

Browse source
This commit is contained in:
matt1432 2024-11-30 23:41:00 -05:00
parent 1ae537b572
commit 6e6b22c456
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/flake/default.nix
View file

@ -3,15 +3,18 @@ inputs: rec {
mkPkgs = {
system,
nixpkgs,
cfg ? {},
cudaSupport ? false,
}:
import nixpkgs {
inherit system;
overlays = [inputs.self.overlays.build-failures];
config = {
inherit cudaSupport;
allowUnfree = true;
};
overlays = [inputs.self.overlays.build-failures] ++ (cfg.overlays or []);
config =
{
inherit cudaSupport;
allowUnfree = true;
}
// (cfg.config or {});
};
# Enable use of `nixpkgs.overlays` on both NixOS and NixOnDroid
@ -20,12 +23,13 @@ inputs: rec {
system,
}: ({config, ...}: let
pkgs = mkPkgs {
cfg = config.nixpkgs;
inherit system cudaSupport;
inherit (inputs) nixpkgs;
};
inherit (pkgs.lib) composeManyExtensions mkForce;
inherit (pkgs.lib) mkForce;
in {
_module.args.pkgs = mkForce (pkgs.extend (composeManyExtensions config.nixpkgs.overlays));
_module.args.pkgs = mkForce pkgs;
});
# Default system