From a9df43c4293b355e07998bf0f24cc2b325a54883 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 23 Mar 2025 18:15:05 +0100 Subject: [PATCH 1/2] mesa: reenable XA for now --- pkgs/development/libraries/mesa/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 14f98cb9d407..024011333668 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -200,7 +200,11 @@ in stdenv.mkDerivation { (lib.mesonBool "gallium-nine" false) # Direct3D9 in Wine, largely supplanted by DXVK (lib.mesonBool "osmesa" false) # deprecated upstream - (lib.mesonEnable "gallium-xa" false) # old and mostly dead + + # Only used by xf86-video-vmware, which has more features than VMWare's KMS driver, + # so we're keeping it for now. Should be removed when that's no longer the case. + # See: https://github.com/NixOS/nixpkgs/pull/392492 + (lib.mesonEnable "gallium-xa" true) (lib.mesonBool "teflon" true) # TensorFlow frontend From 6d11b756a43adb43bc4be31a42e6ab45d7bd7697 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Sun, 23 Mar 2025 18:18:55 +0100 Subject: [PATCH 2/2] xorg.xf86videovmware: restore Mesa/XA dependency --- pkgs/servers/x11/xorg/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index b52627533773..bfbf31f9193e 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -604,6 +604,7 @@ self: super: }); xf86videovmware = super.xf86videovmware.overrideAttrs (attrs: { + buildInputs = attrs.buildInputs ++ [ mesa ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=address" ]; # gcc12 meta = attrs.meta // { platforms = ["i686-linux" "x86_64-linux"];