From 976895c0d04b998a66853158ab312b9fda42d596 Mon Sep 17 00:00:00 2001 From: Tomas Hlavaty Date: Thu, 11 Feb 2016 09:33:42 +0100 Subject: mesa: remove broken dependency on libdrm_intel on armv7l-linux does this work for other arm systems or should it be applied for system.isArm? --- pkgs/development/libraries/mesa/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/development/libraries/mesa') diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index c6af00d08b8..f2b53fc2e59 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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" -- cgit 1.4.1