Browse Source

treewide: transition mesa to libGLU_combined

nixos-19.03
Alexander V. Nikolaev 4 years ago
parent
commit
0acec7e984
  1. 4
      pkgs/applications/audio/helm/default.nix
  2. 4
      pkgs/applications/audio/jack-oscrolloscope/default.nix
  3. 4
      pkgs/applications/audio/meters_lv2/default.nix
  4. 6
      pkgs/applications/audio/pianobooster/default.nix
  5. 4
      pkgs/applications/audio/setbfree/default.nix
  6. 4
      pkgs/applications/audio/sisco.lv2/default.nix
  7. 4
      pkgs/applications/audio/soundscape-renderer/default.nix
  8. 4
      pkgs/applications/audio/yoshimi/default.nix
  9. 4
      pkgs/applications/audio/zam-plugins/default.nix
  10. 4
      pkgs/applications/editors/kodestudio/default.nix
  11. 4
      pkgs/applications/graphics/antimony/default.nix
  12. 4
      pkgs/applications/graphics/ao/default.nix
  13. 4
      pkgs/applications/graphics/cinepaint/default.nix
  14. 4
      pkgs/applications/graphics/digikam/default.nix
  15. 4
      pkgs/applications/graphics/draftsight/default.nix
  16. 4
      pkgs/applications/graphics/exrdisplay/default.nix
  17. 4
      pkgs/applications/graphics/freepv/default.nix
  18. 4
      pkgs/applications/graphics/hugin/default.nix
  19. 4
      pkgs/applications/graphics/k3d/default.nix
  20. 4
      pkgs/applications/graphics/openscad/default.nix
  21. 4
      pkgs/applications/graphics/paraview/default.nix
  22. 4
      pkgs/applications/graphics/seg3d/default.nix
  23. 4
      pkgs/applications/misc/blender/default.nix
  24. 4
      pkgs/applications/misc/cpp-ethereum/default.nix
  25. 4
      pkgs/applications/misc/googleearth/default.nix
  26. 4
      pkgs/applications/misc/icesl/default.nix
  27. 4
      pkgs/applications/misc/navit/default.nix
  28. 4
      pkgs/applications/misc/openbrf/default.nix
  29. 4
      pkgs/applications/networking/browsers/chromium/common.nix
  30. 4
      pkgs/applications/networking/browsers/firefox-bin/default.nix
  31. 4
      pkgs/applications/networking/browsers/firefox/common.nix
  32. 4
      pkgs/applications/networking/browsers/palemoon/default.nix
  33. 4
      pkgs/applications/networking/instant-messengers/viber/default.nix
  34. 2
      pkgs/applications/networking/instant-messengers/zoom-us/default.nix
  35. 4
      pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
  36. 4
      pkgs/applications/networking/mailreaders/thunderbird/default.nix
  37. 2
      pkgs/applications/office/impressive/default.nix
  38. 4
      pkgs/applications/office/libreoffice/default.nix
  39. 4
      pkgs/applications/office/libreoffice/still.nix
  40. 4
      pkgs/applications/science/astronomy/celestia/default.nix
  41. 4
      pkgs/applications/science/astronomy/gravit/default.nix
  42. 4
      pkgs/applications/science/astronomy/stellarium/default.nix
  43. 6
      pkgs/applications/science/chemistry/avogadro/default.nix
  44. 4
      pkgs/applications/science/electronics/kicad/default.nix
  45. 4
      pkgs/applications/science/electronics/kicad/unstable.nix
  46. 2
      pkgs/applications/science/electronics/librepcb/default.nix
  47. 4
      pkgs/applications/science/electronics/pcb/default.nix
  48. 4
      pkgs/applications/science/logic/mcrl2/default.nix
  49. 6
      pkgs/applications/science/math/giac/default.nix
  50. 4
      pkgs/applications/science/math/glsurf/default.nix
  51. 4
      pkgs/applications/science/math/gmsh/default.nix
  52. 4
      pkgs/applications/science/medicine/aliza/default.nix
  53. 4
      pkgs/applications/science/misc/boinc/default.nix
  54. 4
      pkgs/applications/science/misc/golly/beta.nix
  55. 4
      pkgs/applications/science/misc/golly/default.nix
  56. 4
      pkgs/applications/science/misc/gplates/default.nix
  57. 4
      pkgs/applications/science/misc/root/default.nix
  58. 4
      pkgs/applications/science/misc/tulip/default.nix
  59. 4
      pkgs/applications/science/misc/vite/default.nix
  60. 4
      pkgs/applications/version-management/gource/default.nix
  61. 4
      pkgs/applications/video/aegisub/default.nix
  62. 4
      pkgs/applications/video/bomi/default.nix
  63. 4
      pkgs/applications/video/kodi/default.nix
  64. 6
      pkgs/applications/video/makemkv/default.nix
  65. 6
      pkgs/applications/video/mplayer/default.nix
  66. 6
      pkgs/applications/video/mpv/default.nix
  67. 4
      pkgs/applications/video/mythtv/default.nix
  68. 4
      pkgs/applications/video/simplescreenrecorder/default.nix
  69. 4
      pkgs/applications/virtualization/bochs/default.nix
  70. 4
      pkgs/applications/window-managers/compton/git.nix
  71. 4
      pkgs/applications/window-managers/weston/default.nix
  72. 4
      pkgs/desktops/enlightenment/efl.nix
  73. 4
      pkgs/desktops/gnome-2/platform/gtkglext/default.nix
  74. 4
      pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
  75. 2
      pkgs/development/haskell-modules/configuration-common.nix
  76. 2
      pkgs/development/haskell-modules/configuration-nix.nix
  77. 6
      pkgs/development/interpreters/erlang/generic-builder.nix
  78. 4
      pkgs/development/interpreters/io/default.nix
  79. 4
      pkgs/development/interpreters/love/0.10.nix
  80. 4
      pkgs/development/interpreters/love/0.7.nix
  81. 4
      pkgs/development/interpreters/love/0.8.nix
  82. 4
      pkgs/development/interpreters/love/0.9.nix
  83. 4
      pkgs/development/interpreters/lush/default.nix
  84. 4
      pkgs/development/interpreters/octave/default.nix
  85. 6
      pkgs/development/interpreters/renpy/default.nix
  86. 4
      pkgs/development/libraries/AntTweakBar/default.nix
  87. 4
      pkgs/development/libraries/allegro/5.nix
  88. 4
      pkgs/development/libraries/allegro/default.nix
  89. 4
      pkgs/development/libraries/box2d/default.nix
  90. 4
      pkgs/development/libraries/bullet/default.nix
  91. 2
      pkgs/development/libraries/cairo/default.nix
  92. 4
      pkgs/development/libraries/chipmunk/default.nix
  93. 2
      pkgs/development/libraries/cl/default.nix
  94. 4
      pkgs/development/libraries/clutter/default.nix
  95. 4
      pkgs/development/libraries/coin3d/default.nix
  96. 4
      pkgs/development/libraries/epoxy/default.nix
  97. 4
      pkgs/development/libraries/esdl/default.nix
  98. 6
      pkgs/development/libraries/ffmpeg-full/default.nix
  99. 6
      pkgs/development/libraries/ffmpeg/generic.nix
  100. 4
      pkgs/development/libraries/fltk/default.nix
  101. Some files were not shown because too many files have changed in this diff Show More

4
pkgs/applications/audio/helm/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2
, lv2, pkgconfig, mesa }:
, lv2, pkgconfig, libGLU_combined }:
stdenv.mkDerivation rec {
version = "0.9.0";
@ -15,7 +15,7 @@
buildInputs = [
xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext
xorg.libXinerama xorg.libXrender xorg.libXrandr
freetype alsaLib curl libjack2 pkgconfig mesa lv2
freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2
];
CXXFLAGS = "-DHAVE_LROUND";

4
pkgs/applications/audio/jack-oscrolloscope/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }:
{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }:
stdenv.mkDerivation rec {
name = "jack_oscrolloscope-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ SDL libjack2 mesa ];
buildInputs = [ SDL libjack2 libGLU_combined ];
installPhase = ''
mkdir -p $out/bin

4
pkgs/applications/audio/meters_lv2/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig
, lv2, mesa, gtk2, cairo, pango, fftw }:
, lv2, libGLU_combined, gtk2, cairo, pango, fftw }:
let
version = "0.8.1";
@ -26,7 +26,7 @@ stdenv.mkDerivation {
inherit name;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lv2 mesa gtk2 cairo pango fftw ];
buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ];
srcs = [ src robtkSrc ];
sourceRoot = name;

6
pkgs/applications/audio/pianobooster/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }:
{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }:
stdenv.mkDerivation rec {
name = "pianobooster-${version}";
@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
preConfigure = "cd src";
buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ];
buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ];
postInstall = ''
wrapProgram $out/bin/pianobooster \
--prefix LD_LIBRARY_PATH : ${mesa}/lib
--prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib
'';
meta = with stdenv.lib; {

4
pkgs/applications/audio/setbfree/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2
, mesa, pkgconfig, ttf_bitstream_vera
, libGLU_combined, pkgconfig, ttf_bitstream_vera
}:
stdenv.mkDerivation rec {
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
alsaLib freetype ftgl libjack2 libX11 lv2 mesa
alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined
ttf_bitstream_vera
];

4
pkgs/applications/audio/sisco.lv2/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }:
{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }:
let
name = "sisco.lv2-${version}";
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
sourceRoot = src.name;
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ lv2 pango cairo libjack2 mesa ];
buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ];
postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk";
sisco_VERSION = version;

4
pkgs/applications/audio/soundscape-renderer/default.nix

@ -11,7 +11,7 @@
, boost
, ecasound
, glibcLocales
, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL
}:
stdenv.mkDerivation rec {
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ];
# 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers

4
pkgs/applications/audio/yoshimi/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre
, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg
}:
assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa
alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined
minixml zlib xorg.libpthreadstubs pcre
];

4
pkgs/applications/audio/zam-plugins/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }:
stdenv.mkDerivation rec {
name = "zam-plugins-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ];
patchPhase = ''
patchShebangs ./dpf/utils/generate-ttl.sh

4
pkgs/applications/editors/kodestudio/default.nix

@ -1,6 +1,6 @@
{ stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper
, # Patchelf dependencies:
alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa
alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined
, openssl, xlibs, xorg, zlib
}:
@ -55,7 +55,7 @@ in
$out/kodestudio
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \
--set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \
$out/resources/app/extensions/krom/Krom/linux/Krom
patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

4
pkgs/applications/graphics/antimony/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }:
{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }:
let
gitRev = "020910c25614a3752383511ede5a1f5551a8bd39";
@ -24,7 +24,7 @@ in
buildInputs = [
libpng python3 (boost.override { python = python3; })
mesa qtbase ncurses
libGLU_combined qtbase ncurses
];
nativeBuildInputs = [ cmake flex lemon ];

4
pkgs/applications/graphics/ao/default.nix

@ -1,5 +1,5 @@
{stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig
, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext
, libXinerama, libXxf86vm, libXcursor, libXfixes
}:
stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
cmake ninja boost libpng glfw3 epoxy guile mesa libX11
cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11
libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm
libXcursor libXfixes
];

4
pkgs/applications/graphics/cinepaint/default.nix

@ -2,7 +2,7 @@
flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11,
perlXMLParser, pythonPackages, gettext, intltool, babl, gegl,
glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr,
mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } :
let
inherit (pythonPackages) python pygtk;
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg
libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa
gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined
libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk
];

4
pkgs/applications/graphics/digikam/default.nix

@ -34,7 +34,7 @@
, libqtav
, libusb1
, marble
, mesa
, libGLU_combined
, mysql
, opencv3
, pcre
@ -76,7 +76,7 @@ mkDerivation rec {
liblqr1
libqtav
libusb1
mesa
libGLU_combined
opencv3
pcre

4
pkgs/applications/graphics/draftsight/default.nix

@ -1,4 +1,4 @@
{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils,
{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils,
dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
@ -59,7 +59,7 @@ stdenv.mkDerivation {
sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr";
};
libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils
libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils
dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender

4
pkgs/applications/graphics/exrdisplay/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, openexr_ctl }:
{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }:
assert fltk.glSupport;
@ -19,7 +19,7 @@ stdenv.mkDerivation {
'';
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openexr fltk mesa openexr_ctl ];
buildInputs = [ openexr fltk libGLU_combined openexr_ctl ];
meta = {
description = "Application for viewing OpenEXR images on a display at various exposure settings";

4
pkgs/applications/graphics/freepv/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng,
{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng,
libXxf86vm }:
stdenv.mkDerivation {
@ -9,7 +9,7 @@ stdenv.mkDerivation {
sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56";
};
buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng
buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng
libXxf86vm ];
postPatch = ''

4
pkgs/applications/graphics/hugin/default.nix

@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi
, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib
}:
stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg
libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra
libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra
wxGTK zlib
];

4
pkgs/applications/graphics/k3d/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc
, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype
, libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
'';
buildInputs = [
cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng
cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng
boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc
gtkmm2 glibmm gtkglext pangox_compat libXmu

4
pkgs/applications/graphics/openscad/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal
{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal
, mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
}:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib
qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib
pkgconfig harfbuzz qscintilla gettext
];

4
pkgs/applications/graphics/paraview/default.nix

@ -1,6 +1,6 @@
{
stdenv, fetchFromGitHub, cmake
,qtbase, qttools, python, mesa
,qtbase, qttools, python, libGLU_combined
,libXt, qtx11extras, qtxmlpatterns
}:
@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
buildInputs = [
python
mesa
libGLU_combined
libXt
qtbase
qtx11extras

4
pkgs/applications/graphics/seg3d/default.nix

@ -1,4 +1,4 @@
{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu,
{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu,
libuuid }:
assert (stdenv ? glibc);
@ -47,7 +47,7 @@ stdenv.mkDerivation {
exit 1
'';
buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ];
buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ];
meta = {
broken = true;

4
pkgs/applications/misc/blender/default.nix

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew
, ilmbase, libXi, libX11, libXext, libXrender
, libjpeg, libpng, libsamplerate, libsndfile
, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python
, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python
, zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd
, jackaudioSupport ? false, libjack2
, cudaSupport ? false, cudatoolkit
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs =
[ boost cmake ffmpeg gettext glew ilmbase
libXi libX11 libXext libXrender
freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal
freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal
opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc
(opensubdiv.override { inherit cudaSupport; })
]

4
pkgs/applications/misc/cpp-ethereum/default.nix

@ -13,7 +13,7 @@
, miniupnpc
, libmicrohttpd
, gmp
, mesa
, libGLU_combined
, extraCmakeFlags ? []
}:
stdenv.mkDerivation rec {
@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
miniupnpc
libmicrohttpd
gmp
mesa
libGLU_combined
];
dontStrip = true;

4
pkgs/applications/misc/googleearth/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv
{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv
, libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
, zlib, fontconfig, dpkg }:
@ -19,7 +19,7 @@ let
libICE
libXi
libXv
mesa
libGLU_combined
libXrender
libXrandr
libXfixes

4
pkgs/applications/misc/icesl/default.nix

@ -1,6 +1,6 @@
{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }:
{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }:
let
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa libSM libXext ];
lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ];
in
stdenv.mkDerivation rec {
name = "iceSL-${version}";

4
pkgs/applications/misc/navit/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa,
{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined,
libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
stdenv.mkDerivation rec {
name = "navit-svn-3537";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ];
buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa
buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined
libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
nativeBuildInputs = [ pkgconfig cmake ];

4
pkgs/applications/misc/openbrf/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }:
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }:
stdenv.mkDerivation {
@ -28,7 +28,7 @@ stdenv.mkDerivation {
install -Dm644 reference.brf $out/share/openBrf/reference.brf
patchelf \
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
--set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \
$out/share/openBrf/openBrf
mkdir -p "$out/bin"

4
pkgs/applications/networking/browsers/chromium/common.nix

@ -12,7 +12,7 @@
, utillinux, alsaLib
, bison, gperf
, glib, gtk2, gtk3, dbus_glib
, libXScrnSaver, libXcursor, libXtst, mesa
, libXScrnSaver, libXcursor, libXtst, libGLU_combined
, protobuf, speechd, libXdamage, cups
, ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2
@ -126,7 +126,7 @@ let
utillinux alsaLib
bison gperf kerberos
glib gtk2 gtk3 dbus_glib
libXScrnSaver libXcursor libXtst mesa
libXScrnSaver libXcursor libXtst libGLU_combined
pciutils protobuf speechd libXdamage
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]

4
pkgs/applications/networking/browsers/firefox-bin/default.nix

@ -31,7 +31,7 @@
, libgnome
, libgnomeui
, defaultIconTheme
, mesa
, libGLU_combined
, nspr
, nss
, pango
@ -118,7 +118,7 @@ stdenv.mkDerivation {
libcanberra_gtk2
libgnome
libgnomeui
mesa
libGLU_combined
nspr
nss
pango

4
pkgs/applications/networking/browsers/firefox/common.nix

@ -5,7 +5,7 @@
{ lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip, makeWrapper
, yasm, libGLU_combined, sqlite, unzip, makeWrapper
, hunspell, libevent, libstartup_notification, libvpx
, cairo, icu, libpng, jemalloc
, autoconf213, which, gnused, cargo, rustc, llvmPackages
@ -75,7 +75,7 @@ stdenv.mkDerivation (rec {
gtk2 perl zip libIDL libjpeg zlib bzip2
dbus dbus_glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
nspr libnotify xorg.pixman yasm mesa
nspr libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip makeWrapper
hunspell libevent libstartup_notification libvpx /* cairo */

4
pkgs/applications/networking/browsers/palemoon/default.nix

@ -3,7 +3,7 @@
, dbus, dbus_glib, file, fontconfig, freetype
, gstreamer, gst-plugins-base, gst_all_1
, gtk2, hunspell, icu, libevent, libjpeg, libnotify
, libstartup_notification, libvpx, makeWrapper, mesa
, libstartup_notification, libvpx, makeWrapper, libGLU_combined
, nspr, nss, pango, perl, python, libpulseaudio, sqlite
, unzip, xlibs, which, yasm, zip, zlib
}:
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype
gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2
hunspell icu libevent libjpeg libnotify libstartup_notification
libvpx makeWrapper mesa nspr nss pango perl pkgconfig python
libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python
libpulseaudio sqlite unzip which yasm zip zlib
] ++ (with xlibs; [
libX11 libXext libXft libXi libXrender libXScrnSaver

4
pkgs/applications/networking/instant-messengers/viber/default.nix

@ -1,6 +1,6 @@
{fetchurl, stdenv, dpkg, makeWrapper,
alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap,
libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ...
}:
assert stdenv.system == "x86_64-linux";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libpulseaudio
libxml2
libxslt
mesa
libGLU_combined
nspr
nss
openssl

2
pkgs/applications/networking/instant-messengers/zoom-us/default.nix

@ -1,6 +1,6 @@
{ stdenv, fetchurl, system, makeWrapper,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
let

4
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

@ -31,7 +31,7 @@
, libgnome
, libgnomeui
, defaultIconTheme
, mesa
, libGLU_combined
, nspr
, nss
, pango
@ -111,7 +111,7 @@ stdenv.mkDerivation {
libcanberra_gtk2
libgnome
libgnomeui
mesa
libGLU_combined
nspr
nss
pango

4
pkgs/applications/networking/mailreaders/thunderbird/default.nix

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL
, libjpeg, zlib, dbus, dbus_glib, bzip2, xorg
, freetype, fontconfig, file, nspr, nss, libnotify
, yasm, mesa, sqlite, unzip
, yasm, libGLU_combined, sqlite, unzip
, hunspell, libevent, libstartup_notification
, cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc
, autoconf213, which, m4
@ -41,7 +41,7 @@ in stdenv.mkDerivation rec {
[ gtk2 zip libIDL libjpeg zlib bzip2
dbus dbus_glib pango freetype fontconfig xorg.libXi
xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file
nspr nss libnotify xorg.pixman yasm mesa
nspr nss libnotify xorg.pixman yasm libGLU_combined
xorg.libXScrnSaver xorg.scrnsaverproto
xorg.libXext xorg.xextproto sqlite unzip
hunspell libevent libstartup_notification /* cairo */

2
pkgs/applications/office/impressive/default.nix

@ -1,5 +1,5 @@
{ fetchurl, stdenv, python2, makeWrapper, lib
, mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }:
let
version = "0.11.1";

4
pkgs/applications/office/libreoffice/default.nix

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib

4
pkgs/applications/office/libreoffice/still.nix

@ -4,7 +4,7 @@
, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which
, icu, boost, jdk, ant, cups, xorg, libcmis
, openssl, gperf, cppunit, GConf, ORBit2, poppler
, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libzmf
, autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
, unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
@ -240,7 +240,7 @@ in stdenv.mkDerivation rec {
hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
libXaw libXext libXi libXinerama libxml2 libxslt libXtst
libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer
gst_all_1.gst-plugins-base glib
neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
python3 sablotron sane-backends unzip vigra which zip zlib

4
pkgs/applications/science/astronomy/celestia/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu
, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo
, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo
, pango, gdk_pixbuf, atk
}:
@ -45,7 +45,7 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua
buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua
perl autoreconfHook ];
patchPhase = ''

4
pkgs/applications/science/astronomy/gravit/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, mesa, libpng, lua5, autoconf, automake }:
{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }:
stdenv.mkDerivation rec {
name = "gravit-0.5.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7";
};
buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ];
nativeBuildInputs = [ autoconf automake ];

4
pkgs/applications/science/astronomy/stellarium/default.nix

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl
, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv
, qtscript, qtserialport, qttools
, qtmultimedia, qtlocation
}:
@ -16,7 +16,7 @@ mkDerivation rec {
nativeBuildInputs = [ cmake perl ];
buildInputs = [
freetype libpng mesa openssl libiconv qtscript qtserialport qttools
freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools
qtmultimedia qtlocation
];

6
pkgs/applications/science/chemistry/avogadro/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }:
{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }:
stdenv.mkDerivation rec {
name = "avogadro-1.1.1";
@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy";
};
buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ];
buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ];
nativeBuildInputs = [ cmake pkgconfig doxygen ];
NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h";
NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h";
meta = {
description = "Molecule editor and visualizer";

4
pkgs/applications/science/electronics/kicad/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }:
stdenv.mkDerivation rec {
name = "kicad-${version}";
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ];
buildInputs = [ cmake libGLU_combined wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ];
# They say they only support installs to /usr or /usr/local,
# so we have to handle this.

4
pkgs/applications/science/electronics/kicad/unstable.nix

@ -1,4 +1,4 @@
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, mesa, zlib
{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib
, libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [
mesa zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs
cairo curl openssl boost
] ++ optional (oceSupport) opencascade_oce
++ optional (ngspiceSupport) ngspice

2
pkgs/applications/science/electronics/librepcb/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, mesa, openssl, zlib }:
{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }:
stdenv.mkDerivation rec {
name = "librepcb-${version}";

4
pkgs/applications/science/electronics/pcb/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:
{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }:
stdenv.mkDerivation rec {
name = "pcb-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ];
configureFlags = ["--disable-update-desktop-database"];

4
pkgs/applications/science/logic/mcrl2/default.nix

@ -1,4 +1,4 @@
{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost,
{stdenv, fetchurl, xlibs, cmake, subversion, libGLU_combined, qt5, boost,
python27, python27Packages}:
stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m";
};
buildInputs = [ cmake mesa qt5.qtbase boost ];
buildInputs = [ cmake libGLU_combined qt5.qtbase boost ];
enableParallelBuilding = true;

6
pkgs/applications/science/math/giac/default.nix

@ -1,10 +1,10 @@
{ stdenv, fetchurl, texlive, bison, flex
, gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas
, readline, gettext, libpng, libao, gfortran, perl
, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null
, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null
}:
assert enableGUI -> mesa != null && xorg != null && fltk != null;
assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null;
stdenv.mkDerivation rec {
name = "${attr}-${version}";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
# we want libgfortran.so.3 instead
(stdenv.lib.getLib gfortran.cc)
] ++ stdenv.lib.optionals enableGUI [
mesa fltk xorg.libX11
libGLU_combined fltk xorg.libX11
];
outputs = [ "out" ];

4
pkgs/applications/science/math/glsurf/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, ocamlPackages, mesa, freeglut
{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut
, mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib
}:
@ -10,7 +10,7 @@ stdenv.mkDerivation {
sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7";
};
buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp
buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp
libtiff libjpeg libpng giflib ]
++ (with ocamlPackages; [
ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl

4
pkgs/applications/science/math/gmsh/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg
, zlib, mesa, libGLU, xorg }:
, zlib, libGLU_combined, libGLU, xorg }:
let version = "3.0.5"; in
@ -15,7 +15,7 @@ stdenv.mkDerivation {
# that is supposed to work without Fortran but didn't for me.
patches = [ ./CMakeLists.txt.patch ];
buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa
buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined
libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext
xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE
];

4
pkgs/applications/science/medicine/aliza/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }:
{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }:
with stdenv.lib;
stdenv.mkDerivation {
@ -26,7 +26,7 @@ stdenv.mkDerivation {
'';
postInstall = let
libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ];
libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ];
in ''
${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

4
pkgs/applications/science/misc/boinc/default.nix

@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl,
mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
let
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
buildInputs = [
curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
libnotify patchelf libX11 libxcb xcbutil
];

4
pkgs/applications/science/misc/golly/beta.nix

@ -1,5 +1,5 @@
{stdenv, fetchurl, fetchgit
, wxGTK, perl, python2, zlib, mesa, libX11
, wxGTK, perl, python2, zlib, libGLU_combined, libX11
, automake, autoconf
}:
let
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [autoconf automake];
buildInputs = [
wxGTK perl python2 zlib mesa libX11
wxGTK perl python2 zlib libGLU_combined libX11
];
# Link against Python explicitly as it is needed for scripts

4
pkgs/applications/science/misc/golly/default.nix

@ -1,4 +1,4 @@
{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}:
{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}:
stdenv.mkDerivation rec {
baseName="golly";
version = "3.1";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
};
buildInputs = [
wxGTK perl python2 zlib mesa libX11
wxGTK perl python2 zlib libGLU_combined libX11
];
setSourceRoot = ''

4
pkgs/applications/science/misc/gplates/default.nix

@ -1,4 +1,4 @@
{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal
{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal
, proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2
qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2
doxygen graphviz gmp
];

4
pkgs/applications/science/misc/root/default.nix

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2
, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash
, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, <