baseImage: overridable uvmsPkgs/inherit from scope
This commit is contained in:
parent
18d08e727b
commit
a40925c341
2 changed files with 10 additions and 3 deletions
|
|
@ -1,3 +1,9 @@
|
|||
{ nixos }:
|
||||
{ nixos, overrideScope }:
|
||||
|
||||
nixos ../profiles/baseImage.nix
|
||||
nixos {
|
||||
imports = [
|
||||
../profiles/baseImage.nix
|
||||
];
|
||||
_module.args.uvmsPkgs = (overrideScope (fi: _: { uvmsPkgs = fi; })).uvmsPkgs;
|
||||
_file = __curPos.file;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
config,
|
||||
modulesPath,
|
||||
pkgs,
|
||||
uvmsPkgs,
|
||||
...
|
||||
}:
|
||||
let
|
||||
|
|
@ -13,7 +14,6 @@ let
|
|||
inherit (config.system.boot.loader) initrdFile;
|
||||
inherit (config.boot.kernelPackages) kernel;
|
||||
kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target;
|
||||
uvmsPkgs = pkgs.callPackage ../pkgs { };
|
||||
waylandSock = "/run/user/1000/wayland-1";
|
||||
env = {
|
||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
||||
|
|
@ -39,6 +39,7 @@ in
|
|||
./on-failure.nix
|
||||
];
|
||||
config = {
|
||||
_module.args.uvmsPkgs = lib.mkDefault (pkgs.callPackage ../pkgs { });
|
||||
# some.failure-handler.enable = true;
|
||||
hardware.graphics.enable = true;
|
||||
boot.kernelPackages = pkgs.linuxPackagesFor uvmsPkgs.linux-uvm;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue