diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-06 10:33:41 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-06 10:37:15 +0200 |
commit | de5b992ecf9f88dff27737f24e614980f56d4735 (patch) | |
tree | 88c51ac2225b26924a55082ff5390a3cc4f50bc8 /pkgs/development/libraries | |
parent | 72a8019334c9d27925ae6a006d925159d9a23e65 (diff) | |
download | nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar.gz nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar.bz2 nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar.lz nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar.xz nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.tar.zst nixpkgs-de5b992ecf9f88dff27737f24e614980f56d4735.zip |
qt, glew: propagate glu
After removing qt's dependency on the symlinked combination of mesa and glu, many qt apps were missing it now (since e9f0d10). I resove this to a compromise.
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/glew/default.nix | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-4.x/4.8/default.nix | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index ebd60f61057..14b44801e76 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, x11, libXmu, libXi }: +{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }: stdenv.mkDerivation rec { name = "glew-1.9.0"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv"; }; - buildInputs = [ mesa x11 libXmu libXi ]; + buildInputs = [ x11 libXmu libXi ]; + propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux 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 386429bbd59..a29dcec2b39 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, substituteAll , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig -, zlib, libjpeg, libpng, libmng, which, mesa, openssl, dbus, cups, pkgconfig +, zlib, libjpeg, libpng, libmng, which, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu , mysql, postgresql, sqlite , perl, coreutils, libXi @@ -103,7 +103,8 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus.libs freetype fontconfig glib ] - ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa + # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used + ++ optional (stdenv.lib.lists.elem stdenv.system stdenv.lib.platforms.mesaPlatforms) mesa_glu ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]; |