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

treewide: transition mesa to libGLU_combined

Browse Source
This commit is contained in:
Alexander V. Nikolaev 2018-02-24 15:12:44 +02:00
parent 1bc1909e5b
commit 0acec7e984
273 changed files with 572 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -11,7 +11,7 @@
, boost , boost
, ecasound , ecasound
, glibcLocales , 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 { stdenv.mkDerivation rec {
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
LC_ALL = "en_US.UTF-8"; LC_ALL = "en_US.UTF-8";
nativeBuildInputs = [ autoreconfHook pkgconfig ]; 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 # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53
# 2) Make it find ecasound headers # 2) Make it find ecasound headers

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre { 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; assert stdenv ? glibc;
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 minixml zlib xorg.libpthreadstubs pcre
]; ];

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

@ -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 { stdenv.mkDerivation rec {
name = "zam-plugins-${version}"; name = "zam-plugins-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; 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 = '' patchPhase = ''
patchShebangs ./dpf/utils/generate-ttl.sh patchShebangs ./dpf/utils/generate-ttl.sh

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

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

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

@ -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 let
gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; gitRev = "020910c25614a3752383511ede5a1f5551a8bd39";
@ -24,7 +24,7 @@ in
buildInputs = [ buildInputs = [
libpng python3 (boost.override { python = python3; }) libpng python3 (boost.override { python = python3; })
mesa qtbase ncurses libGLU_combined qtbase ncurses
]; ];
nativeBuildInputs = [ cmake flex lemon ]; nativeBuildInputs = [ cmake flex lemon ];

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

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

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

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

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

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

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

@ -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, dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12,
xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc,
libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE,
@ -59,7 +59,7 @@ stdenv.mkDerivation {
sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; 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 dbus_tools alsaLib cups.lib fontconfig glib icu libpng12
xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11
libXcursor libXrandr libxcb libXi libSM libICE libXrender libXcursor libXrandr libxcb libXi libSM libICE libXrender

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

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

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

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

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

@ -1,7 +1,7 @@
{ stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig
, autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext
, glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi , 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 { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg 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 wxGTK zlib
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc { 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 , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff
, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }:
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ 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 boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff
gettext intltool perl unzip ftgl glew asciidoc gettext intltool perl unzip ftgl glew asciidoc
gtkmm2 glibmm gtkglext pangox_compat libXmu gtkmm2 glibmm gtkglext pangox_compat libXmu

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

@ -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 , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext
}: }:
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ 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 pkgconfig harfbuzz qscintilla gettext
]; ];

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

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

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

@ -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 }: libuuid }:
assert (stdenv ? glibc); assert (stdenv ? glibc);
@ -47,7 +47,7 @@ stdenv.mkDerivation {
exit 1 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 = { meta = {
broken = true; broken = true;

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

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

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

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

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

@ -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 , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4
, zlib, fontconfig, dpkg }: , zlib, fontconfig, dpkg }:
@ -19,7 +19,7 @@ let
libICE libICE
libXi libXi
libXv libXv
mesa libGLU_combined
libXrender libXrender
libXrandr libXrandr
libXfixes libXfixes

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

@ -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 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 in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "iceSL-${version}"; name = "iceSL-${version}";

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

@ -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}: libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "navit-svn-3537"; name = "navit-svn-3537";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
hardeningDisable = [ "format" ]; 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 ]; libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ];
nativeBuildInputs = [ pkgconfig cmake ]; nativeBuildInputs = [ pkgconfig cmake ];

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

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }: { stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }:
stdenv.mkDerivation { stdenv.mkDerivation {
@ -28,7 +28,7 @@ stdenv.mkDerivation {
install -Dm644 reference.brf $out/share/openBrf/reference.brf install -Dm644 reference.brf $out/share/openBrf/reference.brf
patchelf \ 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 $out/share/openBrf/openBrf
mkdir -p "$out/bin" mkdir -p "$out/bin"

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

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

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

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

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

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

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

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

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

@ -1,6 +1,6 @@
{fetchurl, stdenv, dpkg, makeWrapper, {fetchurl, stdenv, dpkg, makeWrapper,
alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, 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"; assert stdenv.system == "x86_64-linux";
@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
libpulseaudio libpulseaudio
libxml2 libxml2
libxslt libxslt
mesa libGLU_combined
nspr nspr
nss nss
openssl openssl

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, system, makeWrapper, { stdenv, fetchurl, system, makeWrapper,
alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, 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 let

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

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

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

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

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

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

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

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

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

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

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu { 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 , pango, gdk_pixbuf, atk
}: }:
@ -45,7 +45,7 @@ stdenv.mkDerivation {
}; };
nativeBuildInputs = [ pkgconfig ]; 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 ]; perl autoreconfHook ];
patchPhase = '' patchPhase = ''

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

@ -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 { stdenv.mkDerivation rec {
name = "gravit-0.5.1"; name = "gravit-0.5.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; 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 ]; nativeBuildInputs = [ autoconf automake ];

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

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

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

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

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

@ -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 { stdenv.mkDerivation rec {
name = "kicad-${version}"; 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 enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
nativeBuildInputs = [ pkgconfig ]; 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, # They say they only support installs to /usr or /usr/local,
# so we have to handle this. # so we have to handle this.

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

@ -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 , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig
, doxygen, pcre, libpthreadstubs, libXdmcp , doxygen, pcre, libpthreadstubs, libXdmcp
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake doxygen pkgconfig ]; nativeBuildInputs = [ cmake doxygen pkgconfig ];
buildInputs = [ 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 cairo curl openssl boost
] ++ optional (oceSupport) opencascade_oce ] ++ optional (oceSupport) opencascade_oce
++ optional (ngspiceSupport) ngspice ++ optional (ngspiceSupport) ngspice

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

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

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

@ -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 { stdenv.mkDerivation rec {
name = "pcb-${version}"; name = "pcb-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; 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"]; configureFlags = ["--disable-update-desktop-database"];

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

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

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

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

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

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

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

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

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

@ -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; with stdenv.lib;
stdenv.mkDerivation { stdenv.mkDerivation {
@ -26,7 +26,7 @@ stdenv.mkDerivation {
''; '';
postInstall = let 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 '' in ''
${patchelf}/bin/patchelf \ ${patchelf}/bin/patchelf \
--interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \

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

@ -1,5 +1,5 @@
{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, { 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 }: sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
let let
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
buildInputs = [ 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 libnotify patchelf libX11 libxcb xcbutil
]; ];

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

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

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

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

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

@ -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 }: , proj, boost, cmake, python2, doxygen, graphviz, gmp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ 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 doxygen graphviz gmp
]; ];

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 { 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, libxml2, lz4, lzma, gsl, xxHash
, Cocoa, OpenGL, noSplash ? false }: , Cocoa, OpenGL, noSplash ? false }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ]
++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ]
++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ]
; ;

4
pkgs/applications/science/misc/tulip/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 { fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4
, cmake, makeWrapper, libjpeg, python }: , cmake, makeWrapper, libjpeg, python }:
let version = "4.9.0"; in let version = "4.9.0"; in
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3";
}; };
buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ];
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];

4
pkgs/applications/science/misc/vite/default.nix
View File

@ -1,4 +1,4 @@
{ fetchsvn, stdenv, cmake, qt4, mesa }: { fetchsvn, stdenv, cmake, qt4, libGLU_combined }:
# ViTE 1.1 has several bugs, so use the SVN version. # ViTE 1.1 has several bugs, so use the SVN version.
let let
@ -23,7 +23,7 @@ stdenv.mkDerivation {
ln -sv "${externals}" externals ln -sv "${externals}" externals
''; '';
buildInputs = [ cmake qt4 mesa ]; buildInputs = [ cmake qt4 libGLU_combined ];
NIX_LDFLAGS = "-lGLU"; NIX_LDFLAGS = "-lGLU";

4
pkgs/applications/version-management/gource/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre
, SDL2_image, freetype, glew, mesa, boost, glm , SDL2_image, freetype, glew, libGLU_combined, boost, glm
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined
boost glm freetype boost glm freetype
]; ];

4
pkgs/applications/video/aegisub/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl { stdenv, fetchurl
, libX11, wxGTK , libX11, wxGTK
, libiconv, fontconfig, freetype , libiconv, fontconfig, freetype
, mesa , libGLU_combined
, libass, fftw, ffms , libass, fftw, ffms
, ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies
, icu, boost, intltool # New dependencies , icu, boost, intltool # New dependencies
@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp";
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined
libass fftw ffms ffmpeg zlib icu boost boost.out libiconv libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
] ]
++ optional spellcheckSupport hunspell ++ optional spellcheckSupport hunspell

4
pkgs/applications/video/bomi/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
, libX11, libxcb, mesa , libX11, libxcb, libGLU_combined
, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
, libchardet , libchardet
, ffmpeg , ffmpeg
@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ libX11 [ libX11
libxcb libxcb
mesa libGLU_combined
qtbase qtbase
qtx11extras qtx11extras
qtdeclarative qtdeclarative

4
pkgs/applications/video/kodi/default.nix
View File

@ -8,7 +8,7 @@
, libXt, libXmu, libXext, xextproto , libXt, libXmu, libXext, xextproto
, libXinerama, libXrandr, randrproto , libXinerama, libXrandr, randrproto
, libXtst, libXfixes, fixesproto, systemd , libXtst, libXfixes, fixesproto, systemd
, alsaLib, mesa, glew, fontconfig, freetype, ftgl , alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl
, libjpeg, jasper, libpng, libtiff , libjpeg, jasper, libpng, libtiff
, libmpeg2, libsamplerate, libmad , libmpeg2, libsamplerate, libmad
, libogg, libvorbis, flac, libxslt , libogg, libvorbis, flac, libxslt
@ -125,7 +125,7 @@ in stdenv.mkDerivation rec {
openssl gperf tinyxml2 taglib libssh swig jre openssl gperf tinyxml2 taglib libssh swig jre
libX11 xproto inputproto libXt libXmu libXext xextproto libX11 xproto inputproto libXt libXmu libXext xextproto
libXinerama libXrandr randrproto libXtst libXfixes fixesproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto
alsaLib mesa glew fontconfig freetype ftgl alsaLib libGLU_combined glew fontconfig freetype ftgl
libjpeg jasper libpng libtiff wayland libjpeg jasper libpng libtiff wayland
libmpeg2 libsamplerate libmad libmpeg2 libsamplerate libmad
libogg libvorbis flac libxslt systemd libogg libvorbis flac libxslt systemd

6
pkgs/applications/video/makemkv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl { stdenv, fetchurl
, openssl, qt4, mesa, zlib, pkgconfig, libav , openssl, qt4, libGLU_combined, zlib, pkgconfig, libav
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,9 +18,9 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [openssl qt4 mesa zlib libav]; buildInputs = [openssl qt4 libGLU_combined zlib libav];
libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ]
+ ":" + stdenv.cc.cc + "/lib64"; + ":" + stdenv.cc.cc + "/lib64";
meta = with stdenv.lib; { meta = with stdenv.lib; {

6
pkgs/applications/video/mplayer/default.nix
View File

@ -2,7 +2,7 @@
, aalibSupport ? true, aalib ? null , aalibSupport ? true, aalib ? null
, fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null
, fribidiSupport ? true, fribidi ? null , fribidiSupport ? true, fribidi ? null
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
, xvSupport ? true, libXv ? null , xvSupport ? true, libXv ? null
, alsaSupport ? stdenv.isLinux, alsaLib ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null
@ -32,7 +32,7 @@
assert fontconfigSupport -> (fontconfig != null); assert fontconfigSupport -> (fontconfig != null);
assert (!fontconfigSupport) -> (freefont_ttf != null); assert (!fontconfigSupport) -> (freefont_ttf != null);
assert fribidiSupport -> (fribidi != null); assert fribidiSupport -> (fribidi != null);
assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null);
assert xineramaSupport -> (libXinerama != null && x11Support); assert xineramaSupport -> (libXinerama != null && x11Support);
assert xvSupport -> (libXv != null && x11Support); assert xvSupport -> (libXv != null && x11Support);
assert alsaSupport -> alsaLib != null; assert alsaSupport -> alsaLib != null;
@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
++ optional aalibSupport aalib ++ optional aalibSupport aalib
++ optional fontconfigSupport fontconfig ++ optional fontconfigSupport fontconfig
++ optional fribidiSupport fribidi ++ optional fribidiSupport fribidi
++ optionals x11Support [ libX11 libXext mesa ] ++ optionals x11Support [ libX11 libXext libGLU_combined ]
++ optional alsaSupport alsaLib ++ optional alsaSupport alsaLib
++ optional xvSupport libXv ++ optional xvSupport libXv
++ optional theoraSupport libtheora ++ optional theoraSupport libtheora

6
pkgs/applications/video/mpv/default.nix
View File

@ -4,7 +4,7 @@
, lua, lua5_sockets, libuchardet, libiconv ? null, darwin , lua, lua5_sockets, libuchardet, libiconv ? null, darwin
, x11Support ? true, , x11Support ? true,
mesa ? null, libGLU_combined ? null,
libX11 ? null, libX11 ? null,
libXext ? null, libXext ? null,
libXxf86vm ? null libXxf86vm ? null
@ -45,7 +45,7 @@ with stdenv.lib;
let let
available = x: x != null; available = x: x != null;
in in
assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm];
assert waylandSupport -> all available [wayland libxkbcommon]; assert waylandSupport -> all available [wayland libxkbcommon];
assert rubberbandSupport -> available rubberband; assert rubberbandSupport -> available rubberband;
assert xineramaSupport -> x11Support && available libXinerama; assert xineramaSupport -> x11Support && available libXinerama;
@ -156,7 +156,7 @@ in stdenv.mkDerivation rec {
++ optional vapoursynthSupport vapoursynth ++ optional vapoursynthSupport vapoursynth
++ optional archiveSupport libarchive ++ optional archiveSupport libarchive
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ]
++ optionals waylandSupport [ wayland libxkbcommon ]; ++ optionals waylandSupport [ wayland libxkbcommon ];
enableParallelBuilding = true; enableParallelBuilding = true;

4
pkgs/applications/video/mythtv/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec { stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec
, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig , lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig
, libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu
, yasm, libuuid, taglib, libtool, autoconf, automake, file , yasm, libuuid, taglib, libtool, autoconf, automake, file
}: }:
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sourceRoot = "${name}/mythtv"; sourceRoot = "${name}/mythtv";
buildInputs = [ buildInputs = [
freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec
libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu
libuuid taglib libuuid taglib
]; ];

4
pkgs/applications/video/simplescreenrecorder/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext { stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext
, libXfixes, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja , libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig cmake ninja ]; nativeBuildInputs = [ pkgconfig cmake ninja ];
buildInputs = [ buildInputs = [
alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined
libpulseaudio qt4 libpulseaudio qt4
]; ];

4
pkgs/applications/virtualization/bochs/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl { stdenv, fetchurl
, pkgconfig, libtool , pkgconfig, libtool
, gtk2, mesa, readline, libX11, libXpm , gtk2, libGLU_combined, readline, libX11, libXpm
, docbook_xml_dtd_45, docbook_xsl , docbook_xml_dtd_45, docbook_xsl
, sdlSupport ? true, SDL2 ? null , sdlSupport ? true, SDL2 ? null
, termSupport ? true, ncurses ? null , termSupport ? true, ncurses ? null
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; patches = [ ./bochs-2.6.9-glibc-2.26.patch ];
buildInputs = with stdenv.lib; buildInputs = with stdenv.lib;
[ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]
++ optionals termSupport [ ncurses ] ++ optionals termSupport [ ncurses ]
++ optionals sdlSupport [ SDL2 ] ++ optionals sdlSupport [ SDL2 ]
++ optionals wxSupport [ wxGTK ] ++ optionals wxSupport [ wxGTK ]

4
pkgs/applications/window-managers/compton/git.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45,
docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre, docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre,
pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama,
libXrandr, libXrender, xwininfo }: libXrandr, libXrender, xwininfo }:
@ -33,7 +33,7 @@ stdenv.mkDerivation {
libdrm libdrm
libxml2 libxml2
libxslt libxslt
mesa libGLU_combined
pcre pcre
]; ];

4
pkgs/applications/window-managers/weston/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb { stdenv, fetchurl, pkgconfig, wayland, libGLU_combined, libxkbcommon, cairo, libxcb
, libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
, pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
, libwebp ? null, xwayland ? null, wayland-protocols , libwebp ? null, xwayland ? null, wayland-protocols
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm wayland libGLU_combined libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
libwebp wayland-protocols libwebp wayland-protocols
]; ];

4
pkgs/desktops/enlightenment/efl.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig
, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio , fribidi, SDL2, SDL, libGLU_combined, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio
, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit
, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg
, dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl zlib lz4 freetype fontconfig SDL mesa buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGLU_combined
giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
xorg.libX11 udev systemd ]; xorg.libX11 udev systemd ];

4
pkgs/desktops/gnome-2/platform/gtkglext/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: { stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkglext-1.2.0"; name = "gtkglext-1.2.0";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = with xorg; buildInputs = with xorg;
[ pkgconfig glib gtk mesa pango libX11 libXmu ]; [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ];
propagatedBuildInputs = [ pangox_compat ]; propagatedBuildInputs = [ pangox_compat ];
# The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and

4
pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf { stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf
, pangox_compat, libXmu , pangox_compat, libXmu
}: }:
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [pkgconfig]; nativeBuildInputs = [pkgconfig];
propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ]; propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ];
meta = { meta = {
description = "C++ wrappers for GtkGLExt"; description = "C++ wrappers for GtkGLExt";

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -632,7 +632,7 @@ self: super: {
phash = markBroken super.phash; phash = markBroken super.phash;
# https://github.com/deech/fltkhs/issues/16 # https://github.com/deech/fltkhs/issues/16
# linking fails because the build doesn't pull in the mesa libraries # linking fails because the build doesn't pull in the libGLU_combined libraries
fltkhs = markBroken super.fltkhs; fltkhs = markBroken super.fltkhs;
fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples; fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples;

2
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -221,7 +221,7 @@ self: super: builtins.intersectAttrs super {
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
# Test suite wants to connect to $DISPLAY. # Test suite wants to connect to $DISPLAY.
hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa); hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined);
# Tests attempt to use NPM to install from the network into # Tests attempt to use NPM to install from the network into
# /homeless-shelter. Disabled. # /homeless-shelter. Disabled.

6
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -2,7 +2,7 @@
, libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook
, openjdk ? null # javacSupport , openjdk ? null # javacSupport
, unixODBC ? null # odbcSupport , unixODBC ? null # odbcSupport
, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport , libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
}: }:
{ baseName ? "erlang" { baseName ? "erlang"
@ -17,7 +17,7 @@
, enableKernelPoll ? true , enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ] , javacSupport ? false, javacPackages ? [ openjdk ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ] , odbcSupport ? false, odbcPackages ? [ unixODBC ]
, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] , wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? "" , preUnpack ? "", postUnpack ? ""
, patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
, configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? ""
@ -31,7 +31,7 @@
assert wxSupport -> (if stdenv.isDarwin assert wxSupport -> (if stdenv.isDarwin
then wxmac != null then wxmac != null
else mesa != null && wxGTK != null && xorg != null); else libGLU_combined != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null; assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null; assert javacSupport -> openjdk != null;

4
pkgs/development/interpreters/io/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo,
ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile,
libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl,
python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
zlib sqlite gmp libffi cairo ncurses freetype zlib sqlite gmp libffi cairo ncurses freetype
mesa libpng libtiff libjpeg readline libsndfile libxml2 libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2
freeglut libsamplerate pcre libevent libedit yajl freeglut libsamplerate pcre libevent libedit yajl
pkgconfig glfw openssl libpthreadstubs libXdmcp pkgconfig glfw openssl libpthreadstubs libXdmcp
libmemcached python3 libmemcached python3

4
pkgs/development/interpreters/love/0.10.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, { stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit,
libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
libtheora, which, autoconf, automake, libtool libtheora, which, autoconf, automake, libtool
}: }:
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123
libvorbis libogg libtheora autoconf which libtool automake libvorbis libogg libtheora autoconf which libtool automake
]; ];

4
pkgs/development/interpreters/love/0.7.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL, mesa, openal, lua , SDL, libGLU_combined, openal, lua
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL mesa openal lua SDL libGLU_combined openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libdevil freetype physfs libmodplug mpg123 libvorbis libogg
]; ];

4
pkgs/development/interpreters/love/0.8.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL, mesa, openal, lua , SDL, libGLU_combined, openal, lua
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL mesa openal lua SDL libGLU_combined openal lua
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libdevil freetype physfs libmodplug mpg123 libvorbis libogg
]; ];

4
pkgs/development/interpreters/love/0.9.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, SDL2, mesa, openal, luajit , SDL2, libGLU_combined, openal, luajit
, libdevil, freetype, physfs , libdevil, freetype, physfs
, libmodplug, mpg123, libvorbis, libogg , libmodplug, mpg123, libvorbis, libogg
}: }:
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
SDL2 mesa openal luajit SDL2 libGLU_combined openal luajit
libdevil freetype physfs libmodplug mpg123 libvorbis libogg libdevil freetype physfs libmodplug mpg123 libvorbis libogg
]; ];

4
pkgs/development/interpreters/lush/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL {stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL
, blas, libbfd, intltool, gettext, zlib, libSM}: , blas, libbfd, intltool, gettext, zlib, libSM}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ buildInputs = [
libX11 libSM xproto indent readline gsl freeglut mesa SDL blas libbfd libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd
intltool gettext zlib intltool gettext zlib
]; ];

4
pkgs/development/interpreters/octave/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull
, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk , libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk
, fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp
, qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null
, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (jdk != null) jdk)
++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ])
; ;
# makeinfo is required by Octave at runtime to display help # makeinfo is required by Octave at runtime to display help

6
pkgs/development/interpreters/renpy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 { stdenv, fetchurl, pythonPackages, pkgconfig, SDL2
, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib , libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib
, glib , glib
}: }:
@ -26,13 +26,13 @@ stdenv.mkDerivation {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
python cython wrapPython python cython wrapPython
SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib
]; ];
pythonPath = [ pygame_sdl2 ]; pythonPath = [ pygame_sdl2 ];
RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [
SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib
]); ]);
buildPhase = '' buildPhase = ''

4
pkgs/development/libraries/AntTweakBar/default.nix
View File

@ -1,9 +1,9 @@
{ stdenv, fetchurl, unzip, xlibs, mesa }: { stdenv, fetchurl, unzip, xlibs, libGLU_combined }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "AntTweakBar-1.16"; name = "AntTweakBar-1.16";
buildInputs = [ unzip xlibs.libX11 mesa ]; buildInputs = [ unzip xlibs.libX11 libGLU_combined ];
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip";

4
pkgs/development/libraries/allegro/5.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto { stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac , xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac
, inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora , inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora
, physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs
, libXdmcp , libXdmcp
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
kbproto libjpeg flac kbproto libjpeg flac
inputproto libXi fixesproto libXfixes inputproto libXi fixesproto libXfixes
enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp

4
pkgs/development/libraries/allegro/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto
, libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis
, libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto
, xf86vidmodeproto, libXxf86vm, openal, mesa }: , xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "allegro-${version}"; name = "allegro-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor
alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc
xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined
]; ];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];

4
pkgs/development/libraries/box2d/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto { stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto
, libXi, pkgconfig }: , libXi, pkgconfig }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
unzip cmake mesa freeglut libX11 xproto inputproto libXi unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi
]; ];
cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ];

4
pkgs/development/libraries/bullet/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: { stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bullet-${version}"; name = "bullet-${version}";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake ] ++ buildInputs = [ cmake ] ++
(if stdenv.isDarwin (if stdenv.isDarwin
then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ]
else [mesa freeglut]); else [libGLU_combined freeglut]);
patches = [ ./gwen-narrowing.patch ]; patches = [ ./gwen-narrowing.patch ];

2
pkgs/development/libraries/cairo/default.nix
View File

@ -2,7 +2,7 @@
, libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg
, gobjectSupport ? true, glib , gobjectSupport ? true, glib
, xcbSupport ? true # no longer experimental since 1.12 , xcbSupport ? true # no longer experimental since 1.12
, glSupport ? true, libGL ? null # mesa is no longer a big dependency , glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency
, pdfSupport ? true , pdfSupport ? true
, darwin , darwin
}: }:

4
pkgs/development/libraries/chipmunk/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto { stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto
, inputproto, libXi, libXmu , inputproto, libXi, libXmu
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = buildInputs =
[ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ];
postInstall = '' postInstall = ''
mkdir -p $out/bin mkdir -p $out/bin

2
pkgs/development/libraries/cl/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: {stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.2.3"; version = "1.2.3";

4
pkgs/development/libraries/clutter/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes { stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes
, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib,
gobjectIntrospection, gtk3 gobjectIntrospection, gtk3
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gtk3 ]; buildInputs = [ gtk3 ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
propagatedBuildInputs = propagatedBuildInputs =
[ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango
atk json_glib gobjectIntrospection libxcb atk json_glib gobjectIntrospection libxcb
]; ];

4
pkgs/development/libraries/coin3d/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, mesa }: { fetchurl, stdenv, libGLU_combined }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "coin3d-${version}"; name = "coin3d-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
./sbhashentry.patch ./sbhashentry.patch
]; ];
buildInputs = [ mesa ]; buildInputs = [ libGLU_combined ];
meta = { meta = {
homepage = http://www.coin3d.org/; homepage = http://www.coin3d.org/;

4
pkgs/development/libraries/epoxy/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python
, mesa, libX11 , libGLU_combined, libX11
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
buildInputs = [ mesa libX11 ]; buildInputs = [ libGLU_combined libX11 ];
preConfigure = stdenv.lib.optional stdenv.isDarwin '' preConfigure = stdenv.lib.optional stdenv.isDarwin ''
substituteInPlace configure --replace build_glx=no build_glx=yes substituteInPlace configure --replace build_glx=no build_glx=yes

4
pkgs/development/libraries/esdl/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, SDL, mesa, rebar, erlang}: {stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "esdl-1.3.1"; name = "esdl-1.3.1";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ erlang rebar ]; buildInputs = [ erlang rebar ];
propagatedBuildInputs = [ SDL mesa ]; propagatedBuildInputs = [ SDL libGLU_combined ];
buildPhase = '' buildPhase = ''
rebar compile rebar compile

6
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -102,7 +102,7 @@
#, opencl ? null # OpenCL code #, opencl ? null # OpenCL code
, opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder
#, opencv ? null # Video filtering #, opencv ? null # Video filtering
, openglExtlib ? false, mesa ? null # OpenGL rendering , openglExtlib ? false, libGLU_combined ? null # OpenGL rendering
#, openh264 ? null # H.264/AVC encoder #, openh264 ? null # H.264/AVC encoder
, openjpeg_1 ? null # JPEG 2000 de/encoder , openjpeg_1 ? null # JPEG 2000 de/encoder
, opensslExtlib ? false, openssl ? null , opensslExtlib ? false, openssl ? null
@ -225,7 +225,7 @@ assert gnutls != null -> !opensslExtlib;
assert libxcbshmExtlib -> libxcb != null; assert libxcbshmExtlib -> libxcb != null;
assert libxcbxfixesExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null;
assert libxcbshapeExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null;
assert openglExtlib -> mesa != null; assert openglExtlib -> libGLU_combined != null;
assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
@ -406,7 +406,7 @@ stdenv.mkDerivation rec {
libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11
libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr
samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib
] ++ optional openglExtlib mesa ] ++ optional openglExtlib libGLU_combined
++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optionals nonfreeLicensing [ fdk_aac openssl ]
++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optional ((isLinux || isFreeBSD) && libva != null) libva
++ optionals isLinux [ alsaLib libraw1394 libv4l ] ++ optionals isLinux [ alsaLib libraw1394 libv4l ]

6
pkgs/development/libraries/ffmpeg/generic.nix
View File

@ -3,7 +3,7 @@
, libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
, x264, x265, xvidcore, zlib, libopus , x264, x265, xvidcore, zlib, libopus
, hostPlatform , hostPlatform
, openglSupport ? false, mesa ? null , openglSupport ? false, libGLU_combined ? null
# Build options # Build options
, runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
, multithreadBuild ? true # Multithreading via pthreads/win32 threads , multithreadBuild ? true # Multithreading via pthreads/win32 threads
@ -60,7 +60,7 @@ let
vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm);
in in
assert openglSupport -> mesa != null; assert openglSupport -> libGLU_combined != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -152,7 +152,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus
] ++ optional openglSupport mesa ] ++ optional openglSupport libGLU_combined
++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional ((isLinux || isFreeBSD) && !isArm) libva
++ optional isLinux alsaLib ++ optional isLinux alsaLib

4
pkgs/development/libraries/fltk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi
, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng , freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng
, cfg ? {} , cfg ? {}
, darwin, libtiff, freetype , darwin, libtiff, freetype
}: }:
@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} {
# this could be tidied up (?).. eg why does it require freeglut without glSupport? # this could be tidied up (?).. eg why does it require freeglut without glSupport?
edf { name = "cygwin"; } # use the CygWin libraries default=no edf { name = "cygwin"; } # use the CygWin libraries default=no
// edf { name = "debug"; } # turn on debugging default=no // edf { name = "debug"; } # turn on debugging default=no
// edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes
// edf { name = "shared"; } # turn on shared libraries default=no // edf { name = "shared"; } # turn on shared libraries default=no
// edf { name = "threads"; } # enable multi-threading support // edf { name = "threads"; } # enable multi-threading support
// edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no)

Some files were not shown because too many files have changed in this diff Show More