else/uvms
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

baseImage: overridable uvmsPkgs/inherit from scope

Browse source
This commit is contained in:
Else Someone 2026-03-02 10:49:32 +02:00
parent 18d08e727b
commit a40925c341
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pkgs/baseImage.nix
View file

@ -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
profiles/baseImage.nix
View file

@ -3,6 +3,7 @@
config, config,
modulesPath, modulesPath,
pkgs, pkgs,
uvmsPkgs,
... ...
}: }:
let let
@ -13,7 +14,6 @@ let
inherit (config.system.boot.loader) initrdFile; inherit (config.system.boot.loader) initrdFile;
inherit (config.boot.kernelPackages) kernel; inherit (config.boot.kernelPackages) kernel;
kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target; kernelTarget = pkgs.stdenv.hostPlatform.linux-kernel.target;
uvmsPkgs = pkgs.callPackage ../pkgs { };
waylandSock = "/run/user/1000/wayland-1"; waylandSock = "/run/user/1000/wayland-1";
env = { env = {
XDG_RUNTIME_DIR = "/run/user/1000"; XDG_RUNTIME_DIR = "/run/user/1000";
@ -39,6 +39,7 @@ in
./on-failure.nix ./on-failure.nix
]; ];
config = { config = {
_module.args.uvmsPkgs = lib.mkDefault (pkgs.callPackage ../pkgs { });
# some.failure-handler.enable = true; # some.failure-handler.enable = true;
hardware.graphics.enable = true; hardware.graphics.enable = true;
boot.kernelPackages = pkgs.linuxPackagesFor uvmsPkgs.linux-uvm; boot.kernelPackages = pkgs.linuxPackagesFor uvmsPkgs.linux-uvm;