public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mesa: Don't depend on Wayland"

Browse Source 
This reverts commit 7ff232e9584b6bd78a38b0d6b85dd2c6e0ebce4e.
See discussion at the original commit.

CC: #4999, #5001, #5061, #5071.
This commit is contained in:
Vladimír Čunát 2014-11-24 22:09:43 +01:00
parent 9168041813
commit bb2fba1125
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/mesa/default.nix
View File

@ -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
; ;