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

Qt 4.8: Disable dependency on MESA when the platform doesn't support it.

Browse Source 
svn path=/nixpkgs/trunk/; revision=34450
This commit is contained in:
Ludovic Courtès 2012-06-11 09:31:43 +00:00
parent cc54e3e695
commit 22da1866a7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qt-4.x/4.8/default.nix
View File

@ -79,8 +79,12 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes [ libXrender libXrandr libXinerama libXcursor libXext libXfixes
libXv libXi libSM mesa libXv libXi libSM
] ++ (stdenv.lib.optional (buildWebkit || buildMultimedia) alsaLib) ]
++ (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 ] ++ [ zlib libpng openssl dbus.libs freetype fontconfig glib ]
++ (stdenv.lib.optionals (buildWebkit || buildMultimedia) ++ (stdenv.lib.optionals (buildWebkit || buildMultimedia)
[ gstreamer gst_plugins_base ]); [ gstreamer gst_plugins_base ]);