From 8f77bc2024c7f735e59c83686c605872a0567bd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carles=20Pag=C3=A8s?= Date: Sun, 10 Mar 2013 23:04:24 +0100 Subject: [PATCH] mesa: revert to using gallium drivers. I had copied the config flags for mesa from the building wayland page, but after asking in the channel it turns out there is no technical reason for not using the gallium drivers. --- pkgs/development/libraries/mesa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 1a8ca9c94750..e6f67b3455e9 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation { configureFlags = "" - + " --enable-gles1 --enable-gles2 --disable-gallium-egl" + + " --enable-gles1 --enable-gles2 --enable-gallium-egl" + + " --with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast" + " --with-egl-platforms=x11,wayland,drm --enable-gbm --enable-shared-glapi" - + " --with-gallium-drivers=nouveau,r300,r600,svga,swrast" + stdenv.lib.optionalString enableR600LlvmCompiler " --enable-r600-llvm-compiler" # Texture floats are patented, see docs/patents.txt + stdenv.lib.optionalString enableTextureFloats " --enable-texture-float";