aires/nixos-hardware
aires/nixos-hardware
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1001 from NixOS/improve-compat

Browse source 
common/gpu/24.05-compat: don't create conflicts with user configuration
This commit is contained in:
Jörg Thalheim 2024-06-22 17:17:10 +02:00 committed by GitHub
parent e6d40db892 4e59e4c9e9
commit e8232c132a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
common/gpu/24.05-compat.nix
View file

@ -1,37 +1,13 @@
{ {
config,
lib, lib,
... ...
}: }:
{ {
# Backward-compat for 24.05, can be removed after we drop 24.05 support # Backward-compat for 24.05, can be removed after we drop 24.05 support
options = { imports = lib.optionals (lib.versionOlder lib.version "24.11pre") [
hardware.graphics = lib.optionalAttrs (lib.versionOlder lib.version "24.11pre") { (lib.mkAliasOptionModule [ "hardware" "graphics" "enable" ] [ "hardware" "opengl" "enable" ])
enable = lib.mkOption { (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages" ] [ "hardware" "opengl" "extraPackages" ])
type = lib.types.bool; (lib.mkAliasOptionModule [ "hardware" "graphics" "extraPackages32" ] [ "hardware" "opengl" "extraPackages32" ])
default = false; (lib.mkAliasOptionModule [ "hardware" "graphics" "enable32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
}; ];
enable32Bit = lib.mkOption {
type = lib.types.bool;
default = false;
};
extraPackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [];
};
extraPackages32 = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [];
};
};
};
config = {
hardware.opengl = lib.optionalAttrs (lib.versionOlder lib.version "24.11pre") {
enable = config.hardware.graphics.enable;
driSupport32Bit = config.hardware.graphics.enable32Bit;
extraPackages = config.hardware.graphics.extraPackages;
extraPackages32 = config.hardware.graphics.extraPackages32;
};
};
} }