summary refs log tree commit diff
diff options
context:
space:
mode:
authorr-vdp <ramses@well-founded.dev>2023-03-28 10:50:02 +0200
committerr-vdp <ramses@well-founded.dev>2023-03-28 11:06:07 +0200
commit982ea4295b10fc40bc3df5c2d003e9fb94f97081 (patch)
treeb932dfc159bf0495c2a4c0a4286a2f7bac809df6
parentca39994de4a91b32c586191ad8f6990594926218 (diff)
downloadnixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar.gz
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar.bz2
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar.lz
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar.xz
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.tar.zst
nixpkgs-982ea4295b10fc40bc3df5c2d003e9fb94f97081.zip
NixOS/opengl: Use the default Mesa package by default.
Fixes #223458
Fixes #223331
-rw-r--r--nixos/modules/hardware/opengl.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index c4b93db22be..7b5e669d47f 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -90,8 +90,8 @@ in
 
       mesaPackage = mkOption {
         type = types.package;
-        default = pkgs.mesa_23;
-        defaultText = literalExpression "pkgs.mesa_23";
+        default = pkgs.mesa;
+        defaultText = literalExpression "pkgs.mesa";
         example = literalExpression "pkgs.mesa_22";
         description = lib.mdDoc ''
           The Mesa driver package used for rendering support on the system.
@@ -103,8 +103,8 @@ in
       };
       mesaPackage32 = mkOption {
         type = types.package;
-        default = pkgs.pkgsi686Linux.mesa_23;
-        defaultText = literalExpression "pkgs.pkgsi686Linux.mesa_23";
+        default = pkgs.pkgsi686Linux.mesa;
+        defaultText = literalExpression "pkgs.pkgsi686Linux.mesa";
         example = literalExpression "pkgs.pkgsi686Linux.mesa_22";
         description = lib.mdDoc ''
           Same as {option}`mesaPackage` but for the 32-bit Mesa on 64-bit