mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-23 13:45:49 +02:00
Revert "mesa: Don't depend on Wayland"
This reverts commit 7ff232e958
.
See discussion at the original commit.
CC: #4999, #5001, #5061, #5071.
This commit is contained in:
parent
9168041813
commit
bb2fba1125
|
@ -78,7 +78,7 @@ stdenv.mkDerivation {
|
||||||
|
|
||||||
"--with-dri-drivers=i965,r200,radeon"
|
"--with-dri-drivers=i965,r200,radeon"
|
||||||
"--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
|
"--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi"
|
||||||
"--with-egl-platforms=x11,drm" "--enable-gbm"
|
"--with-egl-platforms=x11,wayland,drm" "--enable-gbm"
|
||||||
]
|
]
|
||||||
++ optional enableTextureFloats "--enable-texture-float"
|
++ optional enableTextureFloats "--enable-texture-float"
|
||||||
++ optionals enableExtraFeatures [
|
++ optionals enableExtraFeatures [
|
||||||
|
@ -97,7 +97,7 @@ stdenv.mkDerivation {
|
||||||
autoreconfHook intltool expat libxml2Python llvm
|
autoreconfHook intltool expat libxml2Python llvm
|
||||||
glproto dri2proto dri3proto presentproto
|
glproto dri2proto dri3proto presentproto
|
||||||
libX11 libXext libxcb libXt libXfixes libxshmfence
|
libX11 libXext libxcb libXt libXfixes libxshmfence
|
||||||
libffi /* wayland */ libvdpau libelf
|
libffi wayland libvdpau libelf
|
||||||
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
|
] ++ optionals enableExtraFeatures [ /*libXvMC*/ ]
|
||||||
++ optional stdenv.isLinux udev
|
++ optional stdenv.isLinux udev
|
||||||
;
|
;
|
||||||
|
|
Loading…
Reference in a new issue