movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/hardware/video/virtualbox: move from generic opengl module

Browse source
This commit is contained in:
K900 2024-06-16 13:53:41 +03:00
parent 98cef4c273
commit 1e3c610b84
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/hardware/graphics.nix
View file

@ -2,10 +2,6 @@
let let
cfg = config.hardware.graphics; cfg = config.hardware.graphics;
kernelPackages = config.boot.kernelPackages;
videoDrivers = config.services.xserver.videoDrivers;
driversEnv = pkgs.buildEnv { driversEnv = pkgs.buildEnv {
name = "graphics-drivers"; name = "graphics-drivers";
paths = [ cfg.package ] ++ cfg.extraPackages; paths = [ cfg.package ] ++ cfg.extraPackages;
@ -126,7 +122,5 @@ in
hardware.graphics.package = lib.mkDefault pkgs.mesa.drivers; hardware.graphics.package = lib.mkDefault pkgs.mesa.drivers;
hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa.drivers; hardware.graphics.package32 = lib.mkDefault pkgs.pkgsi686Linux.mesa.drivers;
boot.extraModulePackages = lib.optional (lib.elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions;
}; };
} }

7
nixos/modules/hardware/video/virtualbox.nix Normal file
View file

@ -0,0 +1,7 @@
{ lib, config, ... }:
let
inherit (config.boot) kernelPackages;
inherit (config.services.xserver) videoDrivers;
in {
boot.extraModulePackages = lib.mkIf (lib.elem "virtualbox" videoDrivers) [ kernelPackages.virtualboxGuestAdditions ];
}

1
nixos/modules/module-list.nix
View file

@ -110,6 +110,7 @@
./hardware/video/nvidia.nix ./hardware/video/nvidia.nix
./hardware/video/switcheroo-control.nix ./hardware/video/switcheroo-control.nix
./hardware/video/uvcvideo/default.nix ./hardware/video/uvcvideo/default.nix
./hardware/video/virtualbox.nix
./hardware/video/webcam/facetimehd.nix ./hardware/video/webcam/facetimehd.nix
./hardware/video/webcam/ipu6.nix ./hardware/video/webcam/ipu6.nix
./hardware/wooting.nix ./hardware/wooting.nix