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

Merge #34461: mesa -> libGL* rename

Browse Source 
This will just bit rot otherwise.  Almost nothing gets rebuilt.
This commit is contained in:
Vladimír Čunát 2018-03-05 14:54:41 +01:00
commit 71f899c2c3
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
361 changed files with 830 additions and 799 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/fmit/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake { stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake
, alsaSupport ? true, alsaLib ? null , alsaSupport ? true, alsaLib ? null
, jackSupport ? false, libjack2 ? null , jackSupport ? false, libjack2 ? null
, portaudioSupport ? false, portaudio ? null }: , portaudioSupport ? false, portaudio ? null }:

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/x42-plugins/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2
, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "20170428"; version = "20170428";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ];
# Don't remove this. The default fails with 'do not know how to unpack source archive' # Don't remove this. The default fails with 'do not know how to unpack source archive'
# every now and then on Hydra. No idea why. # every now and then on Hydra. No idea why.

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/meshlab/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }: { stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }:
let let
meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662";
@ -53,7 +53,7 @@ in stdenv.mkDerivation {
ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver
''; '';
buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ]; buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ];
meta = { meta = {
description = "A system for processing and editing 3D triangular meshes."; description = "A system for processing and editing 3D triangular meshes.";

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/rapcad/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
, qtbase, qmake, mesa_glu , qtbase, qmake, libGLU
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ qmake ]; nativeBuildInputs = [ qmake ];
buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
license = licenses.gpl3; license = licenses.gpl3;

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/graphics/solvespace/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype
, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xlibs, pcre
, wrapGAppsHook , wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
zlib libpng cairo freetype zlib libpng cairo freetype
json_c fontconfig gtkmm3 pangomm glew mesa_glu json_c fontconfig gtkmm3 pangomm glew libGLU
xlibs.libpthreadstubs xlibs.libXdmcp pcre xlibs.libpthreadstubs xlibs.libXdmcp pcre
]; ];
enableParallelBuilding = true; enableParallelBuilding = 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/houdini/runtime.nix
View File

@ -1,11 +1,11 @@
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }: { stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
let let
ld_library_path = builtins.concatStringsSep ":" [ ld_library_path = builtins.concatStringsSep ":" [
"${stdenv.cc.cc.lib}/lib64" "${stdenv.cc.cc.lib}/lib64"
"/run/opengl-driver/lib" "/run/opengl-driver/lib"
(stdenv.lib.makeLibraryPath [ (stdenv.lib.makeLibraryPath [
mesa_glu libGLU
xorg.libXmu xorg.libXmu
xorg.libXi xorg.libXi
xorg.libXext xorg.libXext

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}";

6
pkgs/applications/misc/mupdf/default.nix
View File

@ -2,7 +2,7 @@
, jbig2dec, libjpeg , darwin , jbig2dec, libjpeg , darwin
, enableX11 ? true, libX11, libXext, libXi, libXrandr , enableX11 ? true, libX11, libXext, libXi, libXrandr
, enableCurl ? true, curl, openssl , enableCurl ? true, curl, openssl
, enableGL ? true, freeglut, mesa_glu , enableGL ? true, freeglut, libGLU
}: }:
let let
@ -53,14 +53,14 @@ in stdenv.mkDerivation rec {
makeFlags = [ "prefix=$(out)" ]; makeFlags = [ "prefix=$(out)" ];
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ] buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]
++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableCurl [ curl openssl ]
++ lib.optionals enableGL ( ++ lib.optionals enableGL (
if stdenv.isDarwin then if stdenv.isDarwin then
with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]
else else
[ freeglut mesa_glu ]) [ freeglut libGLU ])
; ;
outputs = [ "bin" "dev" "out" "man" "doc" ]; outputs = [ "bin" "dev" "out" "man" "doc" ];

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/misc/slic3r-prusa3d/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages,
boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu, boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU,
glew, eigen }: glew, eigen }:
let let
AlienWxWidgets = perlPackages.buildPerlPackage rec { AlienWxWidgets = perlPackages.buildPerlPackage rec {
@ -27,7 +27,7 @@ let
url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz";
sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka";
}; };
propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ];
doCheck = false; doCheck = false;
}; };
in in

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
@ -130,7 +130,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/mozilla-plugins/google-talk-plugin/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo { stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo
, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
, dbus-glib, alsaLib, libpulseaudio, systemd, pango , dbus-glib, alsaLib, libpulseaudio, systemd, pango
}: }:
@ -10,7 +10,7 @@ let
baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin";
rpathPlugin = makeLibraryPath rpathPlugin = makeLibraryPath
[ mesa_noglu [ libGL
xorg.libXt xorg.libXt
xorg.libX11 xorg.libX11
xorg.libXrender xorg.libXrender

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/hipchat/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat
, alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd
, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: , libGL, xcbutilkeysyms, xdg_utils, libtool }:
let let
@ -37,7 +37,7 @@ let
expat expat
xcbutilkeysyms xcbutilkeysyms
systemd systemd
mesa_noglu libGL
] + ":${stdenv.cc.cc.lib}/lib64"; ] + ":${stdenv.cc.cc.lib}/lib64";
src = src =

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.12.0"; version = "0.12.0";

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, utillinux , openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux
, 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
@ -255,7 +255,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 , 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/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/chemistry/molden/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, which, gfortran, mesa_glu, xorg } : { stdenv, fetchurl, which, gfortran, libGLU, xorg } :
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "5.7"; version = "5.7";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ which ]; nativeBuildInputs = [ which ];
buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ]; buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ];
postPatch = '' postPatch = ''
substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \

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}";

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

@ -1,4 +1,7 @@
{ 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 +13,11 @@ 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

6
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, mesa_glu, xorg }: , zlib, libGLU_combined, libGLU, xorg }:
let version = "3.0.5"; in let version = "3.0.5"; in
@ -15,8 +15,8 @@ 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
mesa_glu 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 = "5.1.0"; in let version = "5.1.0"; in
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h"; sha256 = "1i70y8b39gkpxfalr9844pa3l4bnnyw5y7ngxdqibil96k2b9q9h";
}; };
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/avidemux/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, cmake, pkgconfig, lndir { stdenv, lib, fetchurl, cmake, pkgconfig, lndir
, zlib, gettext, libvdpau, libva, libXv, sqlite , zlib, gettext, libvdpau, libva, libXv, sqlite
, yasm, freetype, fontconfig, fribidi , yasm, freetype, fontconfig, fribidi
, makeWrapper, libXext, mesa_glu, qttools, qtbase , makeWrapper, libXext, libGLU, qttools, qtbase
, alsaLib , alsaLib
, withX265 ? true, x265 , withX265 ? true, x265
, withX264 ? true, x264 , withX264 ? true, x264
@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ yasm cmake pkgconfig ]; nativeBuildInputs = [ yasm cmake pkgconfig ];
buildInputs = [ buildInputs = [
zlib gettext libvdpau libva libXv sqlite fribidi fontconfig zlib gettext libvdpau libva libXv sqlite fribidi fontconfig
freetype alsaLib libXext mesa_glu makeWrapper freetype alsaLib libXext libGLU makeWrapper
] ++ lib.optional withX264 x264 ] ++ lib.optional withX264 x264
++ lib.optional withX265 x265 ++ lib.optional withX265 x265
++ lib.optional withXvid xvidcore ++ lib.optional withXvid xvidcore

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

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

@ -1,5 +1,5 @@
{ stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv { stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv
, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu , gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
, nvidia_cg_toolkit, zlib, openssl, portaudio , nvidia_cg_toolkit, zlib, openssl, portaudio
}: }:
let let
@ -11,7 +11,7 @@ let
libjpeg_original libjpeg_original
glib glib
gnome2.pango gnome2.pango
mesa_glu libGLU
nvidia_cg_toolkit nvidia_cg_toolkit
zlib zlib
openssl openssl

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, luasocket, libuchardet, libiconv ? null, darwin , lua, luasocket, 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;
@ -157,7 +157,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 ]
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
libiconv Cocoa CoreAudio libiconv Cocoa CoreAudio

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
]; ];

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

@ -1,7 +1,7 @@
{ lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages,
cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip,
poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio,
qmake4Hook, libpng, mesa_noglu, lndir }: qmake4Hook, libpng, libGL, lndir }:
let let
minorVersion = "2.1"; minorVersion = "2.1";
@ -68,7 +68,7 @@ let
sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7";
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu libpng ffmpeg openexr opencolorio openimageio boost libGL
seexpr seexpr
]; ];
}) })
@ -76,7 +76,7 @@ let
pluginName = "misc"; pluginName = "misc";
sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi"; sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi";
buildInputs = [ buildInputs = [
mesa_noglu libGL
]; ];
preConfigure = '' preConfigure = ''
cp ${CImgh} CImg/CImg.h cp ${CImgh} CImg/CImg.h

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/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 { stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45
, docbook_xsl, libxslt, libxml2, makeWrapper , docbook_xsl, libxslt, libxml2, makeWrapper
, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage
, libXinerama, libXrandr, libXrender, libXext, xwininfo }: , libXinerama, libXrandr, libXrender, libXext, xwininfo }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
pcre pcre
libconfig libconfig
dbus dbus
mesa_noglu libGL
]; ];
nativeBuildInputs = [ nativeBuildInputs = [

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 ];

2
pkgs/desktops/enlightenment/enlightenment.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl,
xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib,
luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_glu, luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU,
xkeyboard_config, pcre xkeyboard_config, pcre
}: }:

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";

4
pkgs/desktops/maxx/default.nix
View File

@ -2,7 +2,7 @@
, libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
, libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
, gdk_pixbuf, mesa_noglu, ncurses , gdk_pixbuf, libGL, ncurses
, xclock, xsettingsd }: , xclock, xsettingsd }:
@ -12,7 +12,7 @@ let
deps = [ deps = [
stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
gdk_pixbuf mesa_noglu ncurses gdk_pixbuf libGL ncurses
]; ];
runtime_deps = [ runtime_deps = [
xclock xsettingsd xclock xsettingsd

4
pkgs/desktops/plasma-5/kinfocenter.nix
View File

@ -3,7 +3,7 @@
extra-cmake-modules, kdoctools, extra-cmake-modules, kdoctools,
kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid
}: }:
mkDerivation { mkDerivation {
@ -12,6 +12,6 @@ mkDerivation {
buildInputs = [ buildInputs = [
kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid
]; ];
} }

8
pkgs/development/compilers/factor-lang/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git,
rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
mesa_glu, libXmu, libXt, libICE, libSM }: libGLU, libXmu, libXt, libICE, libSM }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "factor-lang-${version}"; name = "factor-lang-${version}";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ git rlwrap curl perl makeWrapper buildInputs = [ git rlwrap curl perl makeWrapper
libX11 pango cairo gtk2 gdk_pixbuf gtkglext libX11 pango cairo gtk2 gdk_pixbuf gtkglext
mesa_glu libXmu libXt libICE libSM ]; libGLU libXmu libXt libICE libSM ];
buildPhase = '' buildPhase = ''
make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev}
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
# to be a generic solution here. # to be a generic solution here.
find $(echo ${stdenv.lib.makeLibraryPath [ find $(echo ${stdenv.lib.makeLibraryPath [
glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
(echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
for l in $(<$TMPDIR/so.lst); for l in $(<$TMPDIR/so.lst);
@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
"${stdenv.lib.makeLibraryPath [ glib "${stdenv.lib.makeLibraryPath [ glib
libX11 pango cairo gtk2 gdk_pixbuf gtkglext libX11 pango cairo gtk2 gdk_pixbuf gtkglext
mesa_glu libXmu libXt libICE libSM ]}" libGLU libXmu libXt libICE libSM ]}"
sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
mv $out/bin/.factor-wrapped $out/lib/factor/factor mv $out/bin/.factor-wrapped $out/lib/factor/factor

4
pkgs/development/compilers/jetbrains-jdk/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
, mesa_noglu , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo , libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
, gdk_pixbuf, atk }: , gdk_pixbuf, atk }:
# TODO: Investigate building from source instead of patching binaries. # TODO: Investigate building from source instead of patching binaries.
@ -51,7 +51,7 @@ let drv = stdenv.mkDerivation rec {
''; '';
rpath = lib.makeLibraryPath ([ rpath = lib.makeLibraryPath ([
stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk
] ++ (with xorg; [ ] ++ (with xorg; [
libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm

4
pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
View File

@ -22,7 +22,7 @@
, libav_0_8 , libav_0_8
, ffmpeg , ffmpeg
, libxslt , libxslt
, mesa_noglu , libGL
, freetype , freetype
, fontconfig , fontconfig
, gtk2 , gtk2
@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries; rpath = stdenv.lib.strings.makeLibraryPath libraries;

4
pkgs/development/compilers/oraclejdk/jdk9-linux.nix
View File

@ -11,7 +11,7 @@
, libxml2 , libxml2
, ffmpeg_2 , ffmpeg_2
, libxslt , libxslt
, mesa_noglu , libGL
, freetype , freetype
, fontconfig , fontconfig
, gtk2 , gtk2
@ -136,7 +136,7 @@ let result = stdenv.mkDerivation rec {
* libXt is only needed on amd64 * libXt is only needed on amd64
*/ */
libraries = libraries =
[stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++
(if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
rpath = stdenv.lib.strings.makeLibraryPath libraries; rpath = stdenv.lib.strings.makeLibraryPath libraries;

4
pkgs/development/compilers/zulu/8.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
, swingSupport ? true }: , swingSupport ? true }:
@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz"; extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [ libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk gnome2.gtk cairo gdk_pixbuf atk
] ++ (lib.optionals swingSupport (with xorg; [ ] ++ (lib.optionals swingSupport (with xorg; [

4
pkgs/development/compilers/zulu/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib
, swingSupport ? true }: , swingSupport ? true }:
@ -15,7 +15,7 @@ let
extension = if stdenv.isDarwin then "zip" else "tar.gz"; extension = if stdenv.isDarwin then "zip" else "tar.gz";
libraries = [ libraries = [
stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
gnome2.gtk cairo gdk_pixbuf atk zlib gnome2.gtk cairo gdk_pixbuf atk zlib
] ++ (lib.optionals swingSupport (with xorg; [ ] ++ (lib.optionals swingSupport (with xorg; [

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;

4
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.
@ -350,7 +350,7 @@ self: super: builtins.intersectAttrs super {
# https://github.com/deech/fltkhs/issues/16 # https://github.com/deech/fltkhs/issues/16
fltkhs = overrideCabal super.fltkhs (drv: { fltkhs = overrideCabal super.fltkhs (drv: {
libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf];
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg]; librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg];
}); });
# https://github.com/skogsbaer/hscurses/pull/26 # https://github.com/skogsbaer/hscurses/pull/26

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