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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Vladimír Čunát
2016-02-17 10:06:31 +01:00
parent ee994dfae6 2f3eae3a87
commit e9520e81b3
456 changed files with 22536 additions and 2438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,12 +86,16 @@ stdenv.mkDerivation {
# TODO: Figure out how to enable opencl without having a runtime dependency on clang
"--disable-opencl"
"--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
(if "armv7l-linux" == stdenv.system
then null
else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast")
"--enable-shared-glapi"
"--enable-sysfs"
"--enable-driglx-direct" # seems enabled anyway
"--enable-glx-tls"
"--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
(if "armv7l-linux" == stdenv.system
then "--with-dri-drivers="
else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast")
"--with-egl-platforms=x11,wayland,drm"
"--enable-gallium-llvm"