hardware/gpu: hardware.opengl -> hardware.graphics
This commit is contained in:
parent
c399ad4200
commit
1645a8a3a8
2 changed files with 5 additions and 5 deletions
|
@ -14,9 +14,9 @@ in
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
(mkIf (any' (with cfg; [ amdgpu nvidia intel ])) {
|
(mkIf (any' (with cfg; [ amdgpu nvidia intel ])) {
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport32Bit = true;
|
enable32Bit = true;
|
||||||
|
|
||||||
extraPackages = with pkgs; flatten [
|
extraPackages = with pkgs; flatten [
|
||||||
libvdpau-va-gl
|
libvdpau-va-gl
|
||||||
|
|
|
@ -49,7 +49,7 @@ in
|
||||||
extraLibraries = pkgs:
|
extraLibraries = pkgs:
|
||||||
let
|
let
|
||||||
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
|
||||||
additionalLibs = with config.hardware.opengl;
|
additionalLibs = with config.hardware.graphics;
|
||||||
if pkgs.stdenv.hostPlatform.is64bit
|
if pkgs.stdenv.hostPlatform.is64bit
|
||||||
then [ package ] ++ extraPackages
|
then [ package ] ++ extraPackages
|
||||||
else [ package32 ] ++ extraPackages32;
|
else [ package32 ] ++ extraPackages32;
|
||||||
|
@ -129,9 +129,9 @@ in
|
||||||
|
|
||||||
(mkIf cfg.enable {
|
(mkIf cfg.enable {
|
||||||
# Taken from the programs.steam option, reimplemented here to move software into userland
|
# Taken from the programs.steam option, reimplemented here to move software into userland
|
||||||
hardware.opengl = {
|
hardware.graphics = {
|
||||||
enable = true;
|
enable = true;
|
||||||
driSupport32Bit = true;
|
enable32Bit = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
|
hardware.pulseaudio.support32Bit = config.hardware.pulseaudio.enable;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue