From 22da1866a7d3050f6265c59b8ed6b8d6f4e7809c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 11 Jun 2012 09:31:43 +0000 Subject: [PATCH] Qt 4.8: Disable dependency on MESA when the platform doesn't support it. svn path=/nixpkgs/trunk/; revision=34450 --- pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 99a80c2c406..f56886259a6 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -79,8 +79,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes - libXv libXi libSM mesa - ] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) + libXv libXi libSM + ] + ++ (stdenv.lib.optional (stdenv.lib.lists.elem stdenv.system + stdenv.lib.platforms.mesaPlatforms) + mesa) + ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ] ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]);