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

qt, glew: propagate glu

Browse Source 
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.
This commit is contained in:
Vladimír Čunát 2013-08-06 10:33:41 +02:00
parent 72a8019334
commit de5b992ecf
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/glew/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, mesa, x11, libXmu, libXi }: { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glew-1.9.0"; name = "glew-1.9.0";
@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv"; sha256 = "11xpmsw7m5qn7y8fa2ihhqcislz1bdd83mp99didd5ac84756dlv";
}; };
buildInputs = [ mesa x11 libXmu libXi ]; buildInputs = [ x11 libXmu libXi ];
propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h
patchPhase = '' patchPhase = ''
sed -i 's|lib64|lib|' config/Makefile.linux sed -i 's|lib64|lib|' config/Makefile.linux

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

@ -1,7 +1,7 @@
{ stdenv, fetchurl, substituteAll { stdenv, fetchurl, substituteAll
, libXrender, libXinerama, libXcursor, libXmu , libXv, libXext , libXrender, libXinerama, libXcursor, libXmu , libXv, libXext
, libXfixes, libXrandr, libSM, freetype, fontconfig , 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 , libtiff, glib, icu
, mysql, postgresql, sqlite , mysql, postgresql, sqlite
, perl, coreutils, libXi , perl, coreutils, libXi
@ -103,7 +103,8 @@ stdenv.mkDerivation rec {
propagatedBuildInputs = propagatedBuildInputs =
[ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
libSM zlib libpng openssl dbus.libs freetype fontconfig glib ] 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 ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ]; ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst_plugins_base ];