diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-06-11 09:31:43 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-06-11 09:31:43 +0000 |
| commit | 22da1866a7d3050f6265c59b8ed6b8d6f4e7809c (patch) | |
| tree | add2749c8fad07f681bd01325aa502688afc2e40 /pkgs/development/libraries/qt-4.x | |
| parent | cc54e3e695f13e1cb69a25312ab2627665940223 (diff) | |
| download | nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar.gz nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar.bz2 nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar.lz nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar.xz nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.tar.zst nixpkgs-22da1866a7d3050f6265c59b8ed6b8d6f4e7809c.zip | |
Qt 4.8: Disable dependency on MESA when the platform doesn't support it.
svn path=/nixpkgs/trunk/; revision=34450
Diffstat (limited to 'pkgs/development/libraries/qt-4.x')
| -rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 8 |
1 files 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 ]); |