Skip to content

Resolve renamed option hardware.opengl -> hardware.graphics #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SuperSandro2000 merged 2 commits into from
Jul 17, 2024
Merged

Resolve renamed option hardware.opengl -> hardware.graphics #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60b2e5f
Resolve rename option `hardware.opengl` -> `hardware.graphics`
getchoo Jun 26, 2024
ffdae0d
Add aliases for `hardware.graphics` on 24.05
getchoo Jun 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions modules/24.05-compat.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{ lib, ... }: {
# Copied from https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/24.05-compat.nix

# Backward-compat for 24.05, can be removed after we drop 24.05 support
imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
(lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
(lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages" ] [ "hardware" "opengl" "extraPackages" ])
];
Comment thread
SuperSandro2000 marked this conversation as resolved.
}
4 changes: 4 additions & 0 deletions modules/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{ lib, ... }: {
imports = [
# required for options from 24.11 to work on 24.05
# TODO: remove when 24.11 becomes stable
./24.05-compat.nix

./build-tarball.nix
./docker-desktop.nix
./interop.nix
Expand Down
2 changes: 1 addition & 1 deletion modules/wsl-distro.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ in
# WSL does not support virtual consoles
console.enable = false;

hardware.opengl = {
hardware.graphics = {
enable = true; # Enable GPU acceleration

extraPackages = mkIf cfg.useWindowsDriver [
Expand Down