From 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Wed, 31 Jan 2018 16:50:24 +0200 Subject: [PATCH 01/13] mesa: provide default aliases for libGL/GLU Provide default aliases libGL, libGLU for using as default build time providers. This change shouldn't invalidate any hashes. --- pkgs/top-level/all-packages.nix | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e208b9c08c6..54666152c87c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10371,9 +10371,28 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + ## libGL/libGLU/Mesa stuff + + # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them + # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, + # or other runtime dispatcher + libGL = mesa_noglu; + + # Default libGLU + libGLU = mesa_glu; + + # Combined derivation, contains both libGL and libGLU + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # libGLU_combined propagates both libGL and libGLU + libGLU_combined = mesa; + + # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) + libGL_driver = mesa_drivers; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesaDarwinOr = alternative: if stdenv.isDarwin + libGLDarwinOr = alternative: if stdenv.isDarwin then callPackage ../development/libraries/mesa-darwin { inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; @@ -10381,14 +10400,16 @@ with pkgs; } else alternative; - mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { + # FIXME: should be `libGL = libGLDarwinOr mesa_nonglu` but this change cause mass rebuild, + # until all packages will refer to libGL/GLU/GLU combined + mesa_noglu = libGLDarwinOr (callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM }); - mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); - mesa_drivers = mesaDarwinOr ( + mesa_glu = libGLDarwinOr (callPackage ../development/libraries/mesa-glu { }); + mesa_drivers = libGLDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; enableTextureFloats = true; @@ -10400,7 +10421,7 @@ with pkgs; # for packages that assume that libGLU and libGL live in the same prefix. # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether # you need libGLU or not (_glu propagates _noglu). - mesa = mesaDarwinOr (buildEnv { + mesa = libGLDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { @@ -10408,6 +10429,8 @@ with pkgs; }; }); + ## End libGL/libGLU/Mesa stuff + meterbridge = callPackage ../applications/audio/meterbridge { }; mhddfs = callPackage ../tools/filesystems/mhddfs { }; From 8f2a22935c31140891591ed3bb3e6baf230bc4f0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 14:06:44 +0200 Subject: [PATCH 02/13] treewide: transition from mesa_noglu to libGL --- .../mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- pkgs/applications/video/natron/default.nix | 6 +++--- pkgs/applications/window-managers/compton/default.nix | 4 ++-- pkgs/desktops/maxx/default.nix | 4 ++-- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 ++-- pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 4 ++-- pkgs/development/compilers/zulu/8.nix | 4 ++-- pkgs/development/compilers/zulu/default.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 4 ++-- pkgs/development/libraries/SDL2/default.nix | 6 +++--- pkgs/development/libraries/SDL2_ttf/default.nix | 4 ++-- pkgs/development/libraries/beignet/default.nix | 4 ++-- pkgs/development/libraries/cairo/default.nix | 6 +++--- pkgs/development/libraries/cogl/default.nix | 4 ++-- pkgs/development/libraries/freeglut/default.nix | 8 ++++---- pkgs/development/libraries/glfw/2.x.nix | 4 ++-- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- pkgs/development/libraries/libdevil/default.nix | 4 ++-- pkgs/development/libraries/libva/default.nix | 6 +++--- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- pkgs/development/libraries/ocl-icd/default.nix | 4 ++-- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- pkgs/development/libraries/pangolin/default.nix | 4 ++-- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- pkgs/development/libraries/wlc/default.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 4 ++-- pkgs/development/libraries/wxwidgets/2.8/default.nix | 6 +++--- pkgs/development/libraries/wxwidgets/2.9/default.nix | 6 +++--- pkgs/development/libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/development/mobile/genymotion/default.nix | 4 ++-- pkgs/games/commandergenius/default.nix | 4 ++-- pkgs/games/dwarf-fortress/unfuck.nix | 4 ++-- pkgs/games/eternity-engine/default.nix | 4 ++-- pkgs/games/factorio/default.nix | 4 ++-- pkgs/games/gzdoom/default.nix | 4 ++-- pkgs/games/neverball/default.nix | 4 ++-- pkgs/games/openjk/default.nix | 4 ++-- pkgs/games/openmw/tes3mp.nix | 4 ++-- pkgs/games/openspades/default.nix | 4 ++-- pkgs/games/quake3/wrapper/default.nix | 4 ++-- pkgs/misc/emulators/openmsx/default.nix | 4 ++-- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 4 ++-- pkgs/os-specific/linux/kmscube/default.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- pkgs/tools/graphics/glxinfo/default.nix | 4 ++-- 50 files changed, 107 insertions(+), 107 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12e..f3c58725a7a9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -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 , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -10,7 +10,7 @@ let baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath - [ mesa_noglu + [ libGL xorg.libXt xorg.libX11 xorg.libXrender diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 3caa75acb070..e24ea5e6fb37 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg_utils, libtool }: let @@ -37,7 +37,7 @@ let expat xcbutilkeysyms systemd - mesa_noglu + libGL ] + ":${stdenv.cc.cc.lib}/lib64"; src = diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 518cd3d94bac..1eb725d10bbc 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, - qmake4Hook, libpng, mesa_noglu, lndir }: + qmake4Hook, libpng, libGL, lndir }: let minorVersion = "2.1"; @@ -68,7 +68,7 @@ let sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost libGL seexpr ]; }) @@ -76,7 +76,7 @@ let pluginName = "misc"; sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi"; buildInputs = [ - mesa_noglu + libGL ]; preConfigure = '' cp ${CImgh} CImg/CImg.h diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 17baffbe8c73..d79d8c3325d7 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 , 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 }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pcre libconfig dbus - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 4a404b89ff6d..69d16c9b20a1 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -2,7 +2,7 @@ , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 -, gdk_pixbuf, mesa_noglu, ncurses +, gdk_pixbuf, libGL, ncurses , xclock, xsettingsd }: @@ -12,7 +12,7 @@ let deps = [ 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 - gdk_pixbuf mesa_noglu ncurses + gdk_pixbuf libGL ncurses ]; runtime_deps = [ xclock xsettingsd diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 7f23a4d507e7..604474e01fe9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,5 +1,5 @@ { 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 }: # TODO: Investigate building from source instead of patching binaries. @@ -51,7 +51,7 @@ let drv = stdenv.mkDerivation rec { ''; 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 ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 04fe377fab3b..baa136b798d9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -22,7 +22,7 @@ , libav_0_8 , ffmpeg , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ 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 []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index f9b48f239fa7..87f2e49b4431 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -11,7 +11,7 @@ , libxml2 , ffmpeg_2 , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -136,7 +136,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ 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 []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 1be0247c5ec3..23ae8ba06bb5 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { 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 , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; 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 gnome2.gtk cairo gdk_pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 63551d282475..040af83ece20 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { 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 , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; 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 gnome2.gtk cairo gdk_pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edec2724d84d..03299d775f4f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -350,7 +350,7 @@ self: super: builtins.intersectAttrs super { # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { 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 diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 82051854799c..c1b1f244941a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, openglSupport ? false, mesa_noglu, mesa_glu +, openglSupport ? false, libGL, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optionals openglSupport [ mesa_noglu mesa_glu ] ++ + optionals openglSupport [ libGL mesa_glu ] ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 6b6c9599c282..f87e1d5067da 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa_noglu +, openglSupport ? false, libGL , alsaSupport ? true, alsaLib , x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? true, wayland, wayland-protocols, libxkbcommon @@ -15,7 +15,7 @@ # PulseAudio. assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); +assert openglSupport -> (stdenv.isDarwin || libGL != null && x11Support); let configureFlagsFun = attrs: [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ [ libiconv ]; buildInputs = [ audiofile ] ++ - lib.optional openglSupport mesa_noglu ++ + lib.optional openglSupport libGL ++ lib.optional alsaSupport alsaLib ++ lib.optional dbusSupport dbus ++ lib.optional udevSupport udev ++ diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 87436119ef47..4558317ce3e3 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }: +{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [ SDL2 freetype mesa_noglu ] + buildInputs = [ SDL2 freetype libGL ] ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 2484e287016b..02c67d7dbf8b 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -12,7 +12,7 @@ , libXext , python3 , ocl-icd -, mesa_noglu +, libGL , makeWrapper , beignet }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libXdmcp libXdamage ocl-icd - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7c0e36d40689..64b86d66913c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,12 +2,12 @@ , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # mesa is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> mesa_noglu != null; +assert glSupport -> libGL != null; let inherit (stdenv.lib) optional optionals; in @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optional glSupport mesa_noglu + ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 1ac34f7608bc..08d208fa1fe3 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , gstreamerSupport ? true, gst_all_1 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection wayland - mesa_noglu libXrandr libXfixes libXcomposite libXdamage + libGL libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6737e059b212..954af72f9c15 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -11,11 +11,11 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_INCLUDE_DIR=${libGL}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a017ff3d988c..a4f14c9a0147 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }: +{ stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu mesa_noglu libX11 libXext ]; + buildInputs = [ mesa_glu libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index c10b3c05986a..8d4d4d10038a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 +{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 20e74cdc1517..f88d20bee703 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL , libX11, pkgconfig, OpenGL }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dca548a6f9d0..7979eaec7742 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, mesa_noglu +, libGL , minimal ? true, libva }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them enableParallelBuilding = true; configureFlags = [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + "--with-drivers-path=${libGL.driverLink}/lib/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index eccee83fa85e..eebdc2941974 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, xorg, libGL }: stdenv.mkDerivation rec { name = "libvdpau-1.1.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau"; + "--with-module-dir=${libGL.driverLink}/lib/vdpau"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 75dda07494d9..afd2a7b12dfa 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, mesa_noglu }: +{stdenv, fetchurl, ruby, opencl-headers, libGL }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 91899ad8da43..e79c0e4e436d 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu -, mesa_noglu, glew, ocl-icd, python3 +, libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = - [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3 + [ cmake pkgconfig mesa_glu libGL ocl-icd python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 09cbd86eb92b..6fb123f50949 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew , xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig doxygen ]; buildInputs = [ - mesa_noglu + libGL glew xorg.libX11 ffmpeg diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 7bd036cf2e5a..a784461c96bc 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 -, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext +, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5110dd1db647..4bc642030517 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, mesa_noglu, makeWrapper }: + libXext, wayland, libGL, makeWrapper }: let version = "1.0.61.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" - "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${libGL.driverLink}/share:/usr/local/share:/usr/share" ]; outputs = [ "out" "dev" "demos" ]; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 02066253d0f9..846e710b0a48 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, mesa_noglu +, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL , libX11, dbus_libs, wayland-protocols , libpthreadstubs, libXdmcp, libXext , withOptionalPackages ? true, zlib, valgrind, doxygen @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage mesa_noglu + wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL libX11 dbus_libs wayland-protocols libpthreadstubs libXdmcp libXext ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index c32f0a3b9384..a5ec872c3602 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 9ce8e95d9e94..35fc07b249b6 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; with stdenv.lib; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + + optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 6230536b33ab..64c486819cc9 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; with stdenv.lib; @@ -48,7 +48,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 951f27f7d547..c96d2eb8661a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null @@ -9,7 +9,7 @@ }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 745111171bb6..db3cb07765b9 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext ]; - libPath = "${stdenv.lib.makeLibraryPath packages}:${mesa_noglu.driverLink}/lib"; + libPath = "${stdenv.lib.makeLibraryPath packages}:${libGL.driverLink}/lib"; in stdenv.mkDerivation rec { name = "genymotion-${version}"; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index b2a0b2884254..f77dfe8ba945 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, mesa_noglu, boost, cmake }: +, libvorbis, libGL, boost, cmake }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; }; - buildInputs = [ SDL2 SDL2_image mesa_noglu boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 8d7a5a0d1a9d..89e98f4b4518 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, mesa_noglu, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft +, libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft , ncurses, glib, gtk2, libsndfile, zlib }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libSM SDL SDL_image SDL_ttf glew openalSoft - ncurses gtk2 libsndfile zlib mesa_noglu + ncurses gtk2 libsndfile zlib libGL ]; installPhase = '' diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 453afe9e985b..911308a078a5 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: +{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { name = "eternity-engine-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ]; + buildInputs = [ libGL SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 6a5cea0634da..b3319bae9733 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, makeWrapper -, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu +, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , factorio-utils , releaseType , mods ? [] @@ -140,7 +140,7 @@ let libXinerama libXrandr libXi - mesa_noglu + libGL ]; installPhase = base.installPhase + '' diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 2110dfee11ef..459c75ac290e 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper -, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2 +, openal, fluidsynth, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 62d89c7c31e5..50f96a7ee2c8 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, mesa_noglu, libpng, libjpeg, SDL2_ttf, libvorbis, gettext +{ stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext , physfs }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; - buildInputs = [ libpng SDL2 mesa_noglu libjpeg SDL2_ttf libvorbis gettext physfs ]; + buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ]; dontPatchElf = true; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index c65dad7bd4fa..fd662fe9743e 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }: +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: let jamp = makeDesktopItem rec { @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper cmake ]; - buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ]; + buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; # move from $out/JediAcademy to $out/opt/JediAcademy preConfigure = '' diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index cb9e296cdd4f..aba92ac087e8 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }: +, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }: let mygui_ = mygui.override { @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper fakegit ]; buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt - ncurses mesa_noglu ]; + ncurses libGL ]; buildPhase = '' mkdir dependencies keepers diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 02e4e9c608f0..0da2b24b3a20 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file -, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick +, curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake imagemagick unzip zip file ]; buildInputs = [ - freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg + freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg ]; cmakeFlags = [ diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 5f65d26140c8..69b166664be4 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildEnv, lib, fetchurl, mesa_noglu, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: let - libPath = lib.makeLibraryPath [ mesa_noglu stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ libGL stdenv.cc.cc ]; env = buildEnv { name = "quake3-env"; paths = [ ioquake3 ] ++ paks; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index bb954582de5d..d2539cbc8171 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig , python -, alsaLib, glew, mesa_noglu, libpng +, alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis , SDL, SDL_image, SDL_ttf , freetype, tcl, zlib @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; - buildInputs = [ alsaLib glew mesa_noglu libpng + buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype SDL SDL_image SDL_ttf tcl zlib ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 82e2384cf0bd..a09274804440 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.mesa pkgs.libGL.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index e7825a0ebd69..0272eccd800e 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, mesa_noglu +{ stdenv, fetchurl, elfutils, libGL , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses @@ -13,7 +13,7 @@ let kernelDir = if libsOnly then null else kernel.dev; - inherit (mesa_noglu) driverLink; + inherit (libGL) driverLink; bitness = if stdenv.is64bit then "64" else "32"; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index c1389f30b059..6c16803b5090 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 mesa_noglu ]; + buildInputs = [ libdrm libX11 libGL ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6c6a93dc73ac..40f4dc89366e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv + , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + [ freeglut mesa_glu libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 03be1e909307..5960b8b6f047 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }: +{ stdenv, fetchurl, xlibsWrapper, libGL }: let version = "8.3.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper mesa_noglu ]; + buildInputs = [ xlibsWrapper libGL ]; configurePhase = "true"; From 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 14:59:47 +0200 Subject: [PATCH 03/13] treewide: transition from mesa_glu to libGLU --- pkgs/applications/audio/fmit/default.nix | 2 +- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- pkgs/applications/graphics/meshlab/default.nix | 4 ++-- pkgs/applications/graphics/rapcad/default.nix | 4 ++-- pkgs/applications/graphics/solvespace/default.nix | 4 ++-- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- pkgs/applications/misc/mupdf/default.nix | 6 +++--- pkgs/applications/misc/slic3r-prusa3d/default.nix | 4 ++-- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- pkgs/applications/video/lightworks/default.nix | 4 ++-- pkgs/desktops/enlightenment/enlightenment.nix | 2 +- pkgs/desktops/plasma-5/kinfocenter.nix | 4 ++-- pkgs/development/compilers/factor-lang/default.nix | 8 ++++---- pkgs/development/libraries/SDL/default.nix | 4 ++-- pkgs/development/libraries/freeglut/default.nix | 6 +++--- pkgs/development/libraries/glew/1.10.nix | 4 ++-- pkgs/development/libraries/glew/default.nix | 4 ++-- pkgs/development/libraries/glfw/2.x.nix | 4 ++-- pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- pkgs/development/libraries/wxwidgets/2.8/default.nix | 8 ++++---- pkgs/development/libraries/wxwidgets/2.9/default.nix | 8 ++++---- pkgs/development/libraries/wxwidgets/3.0/default.nix | 8 ++++---- pkgs/development/tools/glslviewer/default.nix | 4 ++-- pkgs/development/tools/godot/default.nix | 4 ++-- pkgs/development/tools/unity3d/default.nix | 4 ++-- pkgs/development/tools/vogl/default.nix | 4 ++-- pkgs/games/amoeba/default.nix | 4 ++-- pkgs/games/mar1d/default.nix | 4 ++-- pkgs/games/megaglest/default.nix | 6 +++--- pkgs/games/openrct2/default.nix | 4 ++-- pkgs/games/scrolls/default.nix | 4 ++-- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/games/teeworlds/default.nix | 4 ++-- pkgs/games/tome4/default.nix | 4 ++-- pkgs/games/torcs/default.nix | 4 ++-- pkgs/misc/emulators/desmume/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 4 ++-- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- pkgs/tools/admin/tigervnc/default.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 42 files changed, 92 insertions(+), 92 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index ba3f31d05014..e238f8831421 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -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 , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 0c151697e897..4c4f958ec493 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , 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 { version = "20170428"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; 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' # every now and then on Hydra. No idea why. diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 1e76743eccf4..adb1ec29237e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }: +{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: let meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 451eaae79b2e..c8327b9bca19 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, mesa_glu +, qtbase, qmake, libGLU }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; 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; { license = licenses.gpl3; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index be1a799a9ecf..08ce9c1fc2e4 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,5 @@ { 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 }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew mesa_glu + json_c fontconfig gtkmm3 pangomm glew libGLU xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b3ce98895e6f..e58ff06b29cb 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -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 ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ - mesa_glu + libGLU xorg.libXmu xorg.libXi xorg.libXext diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 5326f948d894..b0d8ba3bb08e 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, mesa_glu +, enableGL ? true, freeglut, libGLU }: let @@ -53,14 +53,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; 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 enableCurl [ curl openssl ] ++ lib.optionals enableGL ( if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut mesa_glu ]) + [ freeglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix index a4ac924cfae0..88cb42e3f5c8 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -1,5 +1,5 @@ { 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 }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { @@ -27,7 +27,7 @@ let url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; + propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; doCheck = false; }; in diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 98499ca009af..1472b4b2af9e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gfortran, mesa_glu, xorg } : +{ stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { version = "5.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ]; - buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ]; + buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; postPatch = '' substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index bb24ac9bd499..31c4fe984770 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, mesa_glu, xorg }: +, zlib, mesa, libGLU, xorg }: let version = "3.0.5"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./CMakeLists.txt.patch ]; buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa - 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 ]; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9c6a49c55136..d0376ca7e3de 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ { 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 }: let @@ -11,7 +11,7 @@ let libjpeg_original glib gnome2.pango - mesa_glu + libGLU nvidia_cg_toolkit zlib openssl diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index cb479f062d62..58fff802080f 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_glu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, xkeyboard_config, pcre }: diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index d366aa4b36e4..b35493929ff3 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid + kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid }: mkDerivation { @@ -12,6 +12,6 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice - kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid + kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid ]; } diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ae2d39d604a6..ce1987866007 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, - mesa_glu, libXmu, libXt, libICE, libSM }: + libGLU, libXmu, libXt, libICE, libSM }: stdenv.mkDerivation rec { name = "factor-lang-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]; + libGLU libXmu libXt libICE libSM ]; buildPhase = '' 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. find $(echo ${stdenv.lib.makeLibraryPath [ 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'"; for l in $(<$TMPDIR/so.lst); @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ "${stdenv.lib.makeLibraryPath [ glib 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 mv $out/bin/.factor-wrapped $out/lib/factor/factor diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index c1b1f244941a..a752fbcbcdd5 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, openglSupport ? false, libGL, mesa_glu +, openglSupport ? false, libGL, libGLU , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optionals openglSupport [ libGL mesa_glu ] ++ + optionals openglSupport [ libGL libGLU ] ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 954af72f9c15..c34d9591d386 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -11,12 +11,12 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 3f8119d36d65..fafcf82258ab 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, x11, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 38b303bde856..eebf4dded4ad 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; buildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a4f14c9a0147..b1118b473b6f 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: +{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu libGL libX11 libXext ]; + buildInputs = [ libGLU libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 4285b05a6250..3ea0155b4f42 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }: +, libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; meta = with stdenv.lib; { homepage = https://github.com/i-rinat/libvdpau-va-gl; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index e79c0e4e436d..2e63d0a8e883 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = - [ cmake pkgconfig mesa_glu libGL ocl-icd python3 + [ cmake pkgconfig libGLU libGL ocl-icd python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 35fc07b249b6..bbb3b0faf347 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa_glu; + ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib "; + + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 64c486819cc9..19c3ca307c5e 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index c96d2eb8661a..98621bb781e8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null @@ -9,7 +9,7 @@ }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 86f78891b2fc..7a28f86562f6 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, mesa_glu, Cocoa +, libX11, libGLU, Cocoa }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glfw mesa_glu glfw libXrandr libXdamage + glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 54e0c53d692c..1ea4d160b4cb 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa_glu, zlib }: +, libpulseaudio, libGLU, zlib }: stdenv.mkDerivation rec { name = "godot-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa_glu zlib + freetype openssl alsaLib libpulseaudio libGLU zlib ]; patches = [ ./pkg_config_additions.patch ]; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index c7ba985d0f75..e507e3898c38 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt -, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev +, gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi @@ -9,7 +9,7 @@ let libPath64 = lib.makeLibraryPath [ - gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr + gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr alsaLib GConf cups libcap fontconfig freetype pango cairo dbus expat zlib libpng12 udev libX11 libXcursor libXdamage libXfixes libXrender libXi diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 9230d99efcc7..e87ba2b52c14 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -3,7 +3,7 @@ , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, mesa_glu +, freeglut, libGLU , fetchpatch }: @@ -33,7 +33,7 @@ mkDerivation rec { qtbase qtx11extras libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut mesa_glu + freeglut libGLU ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 4e5f85f7d5ae..491b20d99690 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }: +{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ]; + buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 5494e32b16b6..9e1e512d711e 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, mesa_glu +, libGLU , x11 , xorg , xinput_calibrator @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doxygen libao libpthreadstubs - mesa_glu + libGLU x11 xinput_calibrator xorg.libXrandr diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index d43904bca6ca..de67afe45a94 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub }: let @@ -9,7 +9,7 @@ let name = "megaglest-lib-env"; paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew mesa_glu wxGTK ]; + stdenv.cc.cc glew libGLU wxGTK ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK - glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; configurePhase = '' cmake -DCMAKE_INSTALL_PREFIX=$out \ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 6881767cbb90..03d296d30053 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, - libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib + libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libpng libpthreadstubs libzip - mesa_glu + libGLU openssl pkgconfig speexdsp diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index c2beeb13cadf..5f1e1a17553b 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gcc -, mesa_glu, libX11, libXext, libXcursor, libpulseaudio +, libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { name = "scrolls-2015-10-13"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ gcc - mesa_glu + libGLU libX11 libXext libXcursor diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index c5e5e525f365..525ea8eeec81 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -48,7 +48,7 @@ let # Verified games requirements xlibs.libXmu xlibs.libxcb - mesa_glu + libGLU libuuid libogg libvorbis diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index bd37ba0f01fb..7c5074c07085 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, python, alsaLib -, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype +, libX11, libGLU, SDL, lua5, zlib, bam, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; buildInputs = [ - python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype + python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype ]; buildPhase = '' diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index f07fd88fbaf3..390ab1eefd18 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: +{stdenv, fetchurl, openal, libpng, libvorbis, libGLU, premake4, SDL2, SDL2_image, SDL2_ttf }: stdenv.mkDerivation rec { version = "1.4.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ premake4 ]; buildInputs = [ - mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image + libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 26f0fe534f3f..522a1a2857d5 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; installTargets = "install datainstall"; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 3e7b033b5788..54ad4bee3cd4 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , agg, alsaLib, soundtouch, openal , desktop_file_utils , gtk2, gtkglext, libglade, pangox_compat -, mesa_glu, libpcap, SDL, zziplib }: +, libGLU, libpcap, SDL, zziplib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat - mesa_glu libpcap SDL zziplib ]; + libGLU libpcap SDL zziplib ]; configureFlags = [ "--disable-glade" # Failing on compile step diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index ef4485ef33fa..6cec834e985f 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, libGLU , makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { epoxy gtk3 gdk_pixbuf - mesa_glu + libGLU mesa libarchive libao diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 3adedf8c1dd1..84b31d4d516b 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu +, withGUI ? true, alsaLib, libX11, qtbase, libGLU }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index e4b206f54488..3818f361cb53 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -3,7 +3,7 @@ , libjpeg_turbo, pixman, fltk , fontDirectories , cmake, gettext, libtool -, glproto, mesa_glu +, glproto, libGLU , gnutls, pam, nettle , xterm, openssh }: @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { fontsproto videoproto scrnsaverproto resourceproto presentproto utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft libxkbfile libXfont2 libpciaccess xineramaproto - glproto mesa_glu + glproto libGLU ] ++ xorgserver.buildInputs; nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ] diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 40f4dc89366e..ec0508d1a62c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut mesa_glu libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; From 0acec7e984ff38b7a296a459ba4b539a3b719c1b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 15:12:44 +0200 Subject: [PATCH 04/13] treewide: transition mesa to libGLU_combined --- pkgs/applications/audio/helm/default.nix | 4 ++-- .../audio/jack-oscrolloscope/default.nix | 4 ++-- pkgs/applications/audio/meters_lv2/default.nix | 4 ++-- pkgs/applications/audio/pianobooster/default.nix | 6 +++--- pkgs/applications/audio/setbfree/default.nix | 4 ++-- pkgs/applications/audio/sisco.lv2/default.nix | 4 ++-- .../audio/soundscape-renderer/default.nix | 4 ++-- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- pkgs/applications/editors/kodestudio/default.nix | 4 ++-- pkgs/applications/graphics/antimony/default.nix | 4 ++-- pkgs/applications/graphics/ao/default.nix | 4 ++-- pkgs/applications/graphics/cinepaint/default.nix | 4 ++-- pkgs/applications/graphics/digikam/default.nix | 4 ++-- .../applications/graphics/draftsight/default.nix | 4 ++-- .../applications/graphics/exrdisplay/default.nix | 4 ++-- pkgs/applications/graphics/freepv/default.nix | 4 ++-- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/applications/graphics/k3d/default.nix | 4 ++-- pkgs/applications/graphics/openscad/default.nix | 4 ++-- pkgs/applications/graphics/paraview/default.nix | 4 ++-- pkgs/applications/graphics/seg3d/default.nix | 4 ++-- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/applications/misc/cpp-ethereum/default.nix | 4 ++-- pkgs/applications/misc/googleearth/default.nix | 4 ++-- pkgs/applications/misc/icesl/default.nix | 4 ++-- pkgs/applications/misc/navit/default.nix | 4 ++-- pkgs/applications/misc/openbrf/default.nix | 4 ++-- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/firefox-bin/default.nix | 4 ++-- .../networking/browsers/firefox/common.nix | 4 ++-- .../networking/browsers/palemoon/default.nix | 4 ++-- .../instant-messengers/viber/default.nix | 4 ++-- .../instant-messengers/zoom-us/default.nix | 2 +- .../mailreaders/thunderbird-bin/default.nix | 4 ++-- .../mailreaders/thunderbird/default.nix | 4 ++-- pkgs/applications/office/impressive/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- .../science/astronomy/celestia/default.nix | 4 ++-- .../science/astronomy/gravit/default.nix | 4 ++-- .../science/astronomy/stellarium/default.nix | 4 ++-- .../science/chemistry/avogadro/default.nix | 6 +++--- .../science/electronics/kicad/default.nix | 4 ++-- .../science/electronics/kicad/unstable.nix | 4 ++-- .../science/electronics/librepcb/default.nix | 2 +- .../science/electronics/pcb/default.nix | 4 ++-- .../applications/science/logic/mcrl2/default.nix | 4 ++-- pkgs/applications/science/math/giac/default.nix | 6 +++--- .../applications/science/math/glsurf/default.nix | 4 ++-- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- .../science/medicine/aliza/default.nix | 4 ++-- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- pkgs/applications/science/misc/golly/beta.nix | 4 ++-- pkgs/applications/science/misc/golly/default.nix | 4 ++-- .../science/misc/gplates/default.nix | 4 ++-- pkgs/applications/science/misc/root/default.nix | 4 ++-- pkgs/applications/science/misc/tulip/default.nix | 4 ++-- pkgs/applications/science/misc/vite/default.nix | 4 ++-- .../version-management/gource/default.nix | 4 ++-- pkgs/applications/video/aegisub/default.nix | 4 ++-- pkgs/applications/video/bomi/default.nix | 4 ++-- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/applications/video/makemkv/default.nix | 6 +++--- pkgs/applications/video/mplayer/default.nix | 6 +++--- pkgs/applications/video/mpv/default.nix | 6 +++--- pkgs/applications/video/mythtv/default.nix | 4 ++-- .../video/simplescreenrecorder/default.nix | 4 ++-- .../virtualization/bochs/default.nix | 4 ++-- .../applications/window-managers/compton/git.nix | 4 ++-- .../window-managers/weston/default.nix | 4 ++-- pkgs/desktops/enlightenment/efl.nix | 4 ++-- .../gnome-2/platform/gtkglext/default.nix | 4 ++-- .../gnome-2/platform/gtkglextmm/default.nix | 4 ++-- .../haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-nix.nix | 2 +- .../interpreters/erlang/generic-builder.nix | 6 +++--- pkgs/development/interpreters/io/default.nix | 4 ++-- pkgs/development/interpreters/love/0.10.nix | 4 ++-- pkgs/development/interpreters/love/0.7.nix | 4 ++-- pkgs/development/interpreters/love/0.8.nix | 4 ++-- pkgs/development/interpreters/love/0.9.nix | 4 ++-- pkgs/development/interpreters/lush/default.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 4 ++-- pkgs/development/interpreters/renpy/default.nix | 6 +++--- .../libraries/AntTweakBar/default.nix | 4 ++-- pkgs/development/libraries/allegro/5.nix | 4 ++-- pkgs/development/libraries/allegro/default.nix | 4 ++-- pkgs/development/libraries/box2d/default.nix | 4 ++-- pkgs/development/libraries/bullet/default.nix | 4 ++-- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/chipmunk/default.nix | 4 ++-- pkgs/development/libraries/cl/default.nix | 2 +- pkgs/development/libraries/clutter/default.nix | 4 ++-- pkgs/development/libraries/coin3d/default.nix | 4 ++-- pkgs/development/libraries/epoxy/default.nix | 4 ++-- pkgs/development/libraries/esdl/default.nix | 4 ++-- .../libraries/ffmpeg-full/default.nix | 6 +++--- pkgs/development/libraries/ffmpeg/generic.nix | 6 +++--- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/fox/fox-1.6.nix | 4 ++-- pkgs/development/libraries/freenect/default.nix | 4 ++-- pkgs/development/libraries/ftgl/default.nix | 4 ++-- pkgs/development/libraries/gle/default.nix | 4 ++-- pkgs/development/libraries/glui/default.nix | 4 ++-- .../libraries/gstreamer/bad/default.nix | 4 ++-- .../libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/libraries/irrlicht/default.nix | 4 ++-- pkgs/development/libraries/java/swt/default.nix | 4 ++-- pkgs/development/libraries/libagar/default.nix | 6 +++--- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- pkgs/development/libraries/libqtav/default.nix | 10 +++++----- pkgs/development/libraries/libtcod/default.nix | 4 ++-- .../libraries/libtxc_dxtn/default.nix | 4 ++-- .../libraries/libtxc_dxtn_s2tc/default.nix | 4 ++-- pkgs/development/libraries/libwebp/default.nix | 6 +++--- pkgs/development/libraries/liquidfun/default.nix | 4 ++-- .../libraries/mediastreamer/default.nix | 4 ++-- pkgs/development/libraries/mygui/default.nix | 4 ++-- pkgs/development/libraries/ogre/1.9.x.nix | 4 ++-- pkgs/development/libraries/ogre/default.nix | 4 ++-- .../libraries/opencascade/default.nix | 4 ++-- pkgs/development/libraries/opencsg/default.nix | 4 ++-- .../libraries/openexrid-unstable/default.nix | 4 ++-- pkgs/development/libraries/partio/default.nix | 4 ++-- pkgs/development/libraries/phonon/default.nix | 4 ++-- .../libraries/physics/geant4/default.nix | 8 ++++---- pkgs/development/libraries/plib/default.nix | 4 ++-- pkgs/development/libraries/qt-3/default.nix | 6 +++--- pkgs/development/libraries/quesoglc/default.nix | 4 ++-- pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/development/libraries/smpeg/default.nix | 4 ++-- .../libraries/vaapi-vdpau/default.nix | 4 ++-- pkgs/development/libraries/vrpn/default.nix | 4 ++-- pkgs/development/libraries/vtk/default.nix | 4 ++-- pkgs/development/libraries/webkitgtk/2.18.nix | 4 ++-- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- pkgs/development/misc/amdapp-sdk/default.nix | 4 ++-- .../development/mobile/androidenv/androidsdk.nix | 4 ++-- pkgs/development/mobile/androidenv/default.nix | 2 +- .../development/ocaml-modules/lablgl/default.nix | 4 ++-- pkgs/development/pharo/vm/build-vm-legacy.nix | 6 +++--- pkgs/development/pharo/vm/build-vm.nix | 6 +++--- pkgs/development/pharo/vm/vms.nix | 2 +- pkgs/development/pure-modules/gl/default.nix | 4 ++-- .../python-modules/pyftgl/default.nix | 4 ++-- .../python-modules/pyglet/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 2 +- .../tools/godot/pkg_config_additions.patch | 2 +- pkgs/development/tools/simavr/default.nix | 4 ++-- pkgs/games/0ad/game.nix | 4 ++-- pkgs/games/adom/default.nix | 4 ++-- pkgs/games/alienarena/default.nix | 6 +++--- pkgs/games/armagetronad/default.nix | 4 ++-- pkgs/games/arx-libertatis/default.nix | 4 ++-- pkgs/games/astromenace/default.nix | 4 ++-- pkgs/games/bitsnbots/default.nix | 4 ++-- pkgs/games/blackshades/default.nix | 4 ++-- pkgs/games/blackshadeselite/default.nix | 4 ++-- pkgs/games/blobby/default.nix | 4 ++-- pkgs/games/btanks/default.nix | 4 ++-- pkgs/games/bzflag/default.nix | 4 ++-- pkgs/games/construo/default.nix | 4 ++-- pkgs/games/crack-attack/default.nix | 4 ++-- pkgs/games/crawl/default.nix | 4 ++-- pkgs/games/crrcsim/default.nix | 4 ++-- pkgs/games/dhewm3/default.nix | 6 +++--- pkgs/games/dwarf-fortress/dfhack/default.nix | 4 ++-- pkgs/games/dxx-rebirth/default.nix | 4 ++-- pkgs/games/eduke32/default.nix | 8 ++++---- pkgs/games/egoboo/default.nix | 4 ++-- pkgs/games/extremetuxracer/default.nix | 4 ++-- pkgs/games/ezquake/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/games/freeorion/default.nix | 4 ++-- pkgs/games/fsg/default.nix | 4 ++-- pkgs/games/gl-117/default.nix | 4 ++-- pkgs/games/globulation/default.nix | 4 ++-- pkgs/games/gltron/default.nix | 4 ++-- pkgs/games/hedgewars/default.nix | 6 +++--- pkgs/games/kobodeluxe/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 4 ++-- pkgs/games/liquidwar/default.nix | 4 ++-- pkgs/games/mars/default.nix | 4 ++-- pkgs/games/minecraft/default.nix | 4 ++-- pkgs/games/minetest/default.nix | 4 ++-- pkgs/games/naev/default.nix | 4 ++-- pkgs/games/newtonwars/default.nix | 6 +++--- pkgs/games/nexuiz/default.nix | 4 ++-- pkgs/games/openrw/default.nix | 4 ++-- pkgs/games/openxcom/default.nix | 4 ++-- pkgs/games/pingus/default.nix | 4 ++-- pkgs/games/pioneer/default.nix | 4 ++-- pkgs/games/prboom/default.nix | 4 ++-- pkgs/games/privateer/default.nix | 4 ++-- pkgs/games/quake3/ioquake/default.nix | 4 ++-- pkgs/games/residualvm/default.nix | 6 +++--- pkgs/games/rigsofrods/default.nix | 4 ++-- pkgs/games/sauerbraten/default.nix | 4 ++-- pkgs/games/scorched3d/default.nix | 4 ++-- pkgs/games/scummvm/default.nix | 4 ++-- pkgs/games/soi/default.nix | 4 ++-- pkgs/games/space-orbit/default.nix | 4 ++-- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/spring/default.nix | 4 ++-- pkgs/games/stardust/default.nix | 4 ++-- pkgs/games/super-tux-kart/default.nix | 4 ++-- pkgs/games/supertux/default.nix | 4 ++-- pkgs/games/tibia/default.nix | 4 ++-- pkgs/games/trackballs/default.nix | 4 ++-- pkgs/games/tremulous/default.nix | 4 ++-- pkgs/games/trigger/default.nix | 4 ++-- pkgs/games/ufoai/default.nix | 4 ++-- pkgs/games/ultimatestunts/default.nix | 4 ++-- pkgs/games/ultrastardx/default.nix | 4 ++-- pkgs/games/unvanquished/default.nix | 4 ++-- pkgs/games/uqm/default.nix | 4 ++-- pkgs/games/urbanterror/default.nix | 6 +++--- pkgs/games/vdrift/default.nix | 4 ++-- pkgs/games/voxelands/default.nix | 4 ++-- pkgs/games/warsow/default.nix | 6 +++--- pkgs/games/worldofgoo/default.nix | 4 ++-- pkgs/games/xmoto/default.nix | 4 ++-- pkgs/games/xonotic/default.nix | 4 ++-- pkgs/games/xpilot/bloodspilot-client.nix | 4 ++-- pkgs/games/xpilot/default.nix | 4 ++-- pkgs/games/zandronum/default.nix | 4 ++-- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/misc/emulators/dosbox/default.nix | 4 ++-- pkgs/misc/emulators/dosbox/unstable.nix | 4 ++-- pkgs/misc/emulators/emulationstation/default.nix | 4 ++-- pkgs/misc/emulators/fakenes/default.nix | 4 ++-- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/misc/emulators/mess/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/cores.nix | 16 ++++++++-------- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- pkgs/misc/emulators/vbam/default.nix | 4 ++-- pkgs/misc/emulators/vice/default.nix | 4 ++-- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/misc/emulators/wxmupen64plus/default.nix | 4 ++-- pkgs/misc/emulators/yabause/default.nix | 4 ++-- pkgs/misc/emulators/zsnes/default.nix | 4 ++-- pkgs/misc/gnash/default.nix | 10 +++++----- pkgs/misc/screensavers/electricsheep/default.nix | 4 ++-- pkgs/misc/screensavers/rss-glx/default.nix | 4 ++-- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- pkgs/os-specific/linux/ati-drivers/builder.sh | 4 ++-- pkgs/os-specific/linux/ati-drivers/default.nix | 8 ++++---- pkgs/os-specific/linux/kmscon/default.nix | 4 ++-- pkgs/os-specific/linux/kmscube/default.nix | 2 +- pkgs/tools/X11/virtualgl/lib.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 2 +- pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++-- pkgs/tools/graphics/glee/default.nix | 4 ++-- pkgs/tools/graphics/glmark2/default.nix | 4 ++-- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 4 ++-- pkgs/tools/graphics/maim/default.nix | 4 ++-- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- pkgs/tools/misc/kisslicer/default.nix | 6 +++--- pkgs/tools/misc/ocz-ssd-guru/default.nix | 4 ++-- pkgs/tools/misc/pipelight/default.nix | 4 ++-- pkgs/tools/misc/slop/default.nix | 4 ++-- pkgs/tools/security/enpass/default.nix | 4 ++-- pkgs/tools/text/mpage/default.nix | 4 ++-- 273 files changed, 572 insertions(+), 572 deletions(-) diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 80fb6a9ef923..fa76a1a26e82 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 - , lv2, pkgconfig, mesa }: + , lv2, pkgconfig, libGLU_combined }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -15,7 +15,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig mesa lv2 + freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index a75513ff059e..75a8a6a4b1a1 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libjack2 mesa ]; + buildInputs = [ SDL libjack2 libGLU_combined ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index f4245b0a51e3..669ffbb2688a 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, lv2, mesa, gtk2, cairo, pango, fftw }: +, lv2, libGLU_combined, gtk2, cairo, pango, fftw }: let version = "0.8.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 mesa gtk2 cairo pango fftw ]; + buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 67848cdc804b..d013a26277e8 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }: +{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: stdenv.mkDerivation rec { name = "pianobooster-${version}"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ]; + buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ]; postInstall = '' wrapProgram $out/bin/pianobooster \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib + --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 63705d40c3f6..4d8435454239 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, mesa, pkgconfig, ttf_bitstream_vera +, libGLU_combined, pkgconfig, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 mesa + alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index a60c3bef0daa..32cfd0f74940 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }: +{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sourceRoot = src.name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 pango cairo libjack2 mesa ]; + buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 44c3bd70d3dc..47851adc3aaf 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -11,7 +11,7 @@ , boost , ecasound , glibcLocales -, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 27d82942d343..cdf84cb7e46f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined minixml zlib xorg.libpthreadstubs pcre ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index e9a445ec1427..210d0f7e989d 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { name = "zam-plugins-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; + buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; patchPhase = '' patchShebangs ./dpf/utils/generate-ttl.sh diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index a0e941289099..8eb2f392ddc0 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa + alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined , openssl, xlibs, xorg, zlib }: @@ -55,7 +55,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index f9ea2b9aa84e..334a5a33dadf 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: +{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }: let gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; @@ -24,7 +24,7 @@ in buildInputs = [ libpng python3 (boost.override { python = python3; }) - mesa qtbase ncurses + libGLU_combined qtbase ncurses ]; nativeBuildInputs = [ cmake flex lemon ]; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 990fee8cc37c..d415df1bae80 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig -, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext +, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext , libXinerama, libXxf86vm, libXcursor, libXfixes }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake ninja boost libpng glfw3 epoxy guile mesa libX11 + cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11 libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes ]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 22ac473bdd95..d46128c62c02 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, pythonPackages, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : + libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let inherit (pythonPackages) python pygtk; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl - gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa + gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index d2ef35fcca80..9dd0722541f4 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -34,7 +34,7 @@ , libqtav , libusb1 , marble -, mesa +, libGLU_combined , mysql , opencv3 , pcre @@ -76,7 +76,7 @@ mkDerivation rec { liblqr1 libqtav libusb1 - mesa + libGLU_combined opencv3 pcre diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 17334c5b366c..9ab43ff94337 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils, +{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, @@ -59,7 +59,7 @@ stdenv.mkDerivation { sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; }; - libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils + libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 3386d75e81e1..aee65803e53f 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: assert fltk.glSupport; @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk mesa openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index e6d8a06a5193..0bd3421f1b10 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng + buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng libXxf86vm ]; postPatch = '' diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9acd8357cb71..82741665161f 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra + libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra wxGTK zlib ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index ce315ebc5120..eb59b6ff6d65 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng + cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl unzip ftgl glew asciidoc gtkmm2 glibmm gtkglext pangox_compat libXmu diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 06a1a946cdf6..33fddf6c8d01 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib + qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib pkgconfig harfbuzz qscintilla gettext ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 8b532a7ad44f..42b69e249267 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake -,qtbase, qttools, python, mesa +,qtbase, qttools, python, libGLU_combined ,libXt, qtx11extras, qtxmlpatterns }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ python - mesa + libGLU_combined libXt qtbase qtx11extras diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index e97278148f99..80987a8c7411 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu, +{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu, libuuid }: assert (stdenv ? glibc); @@ -47,7 +47,7 @@ stdenv.mkDerivation { exit 1 ''; - buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ]; + buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ]; meta = { broken = true; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b348f253b350..7391652fa8ea 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender - freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) ] diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 150c900ba9fb..857254c3cb03 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -13,7 +13,7 @@ , miniupnpc , libmicrohttpd , gmp -, mesa +, libGLU_combined , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { miniupnpc libmicrohttpd gmp - mesa + libGLU_combined ]; dontStrip = true; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 52903a1f8014..f8ba66c4197c 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv +{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 , zlib, fontconfig, dpkg }: @@ -19,7 +19,7 @@ let libICE libXi libXv - mesa + libGLU_combined libXrender libXrandr libXfixes diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index d39d734dd7b9..2295e15cc3d3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: let - lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa libSM libXext ]; + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in stdenv.mkDerivation rec { name = "iceSL-${version}"; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 51b29a5c04c4..92269e03e58d 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 4aebd3bb2a96..b8b6e42d5cf5 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }: +{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bb5a7046dd49..a63f621e9bee 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,7 +12,7 @@ , utillinux, alsaLib , bison, gperf , glib, gtk2, gtk3, dbus_glib -, libXScrnSaver, libXcursor, libXtst, mesa +, libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -126,7 +126,7 @@ let utillinux alsaLib bison gperf kerberos glib gtk2 gtk3 dbus_glib - libXScrnSaver libXcursor libXtst mesa + libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 347ceba9ab4a..9faa67cfc557 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -118,7 +118,7 @@ stdenv.mkDerivation { libcanberra_gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 69e935d78762..2b3407d0175c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -5,7 +5,7 @@ { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper +, yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, icu, libpng, jemalloc , autoconf213, which, gnused, cargo, rustc, llvmPackages @@ -75,7 +75,7 @@ stdenv.mkDerivation (rec { gtk2 perl zip libIDL libjpeg zlib bzip2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr libnotify xorg.pixman yasm mesa + nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cd4f95097889..a5c5472f1c78 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,7 +3,7 @@ , dbus, dbus_glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, mesa +, libstartup_notification, libvpx, makeWrapper, libGLU_combined , nspr, nss, pango, perl, python, libpulseaudio, sqlite , unzip, xlibs, which, yasm, zip, zlib }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper mesa nspr nss pango perl pkgconfig python + libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python libpulseaudio sqlite unzip which yasm zip zlib ] ++ (with xlibs; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7e960d2329e..3c164820019b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: assert stdenv.system == "x86_64-linux"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpulseaudio libxml2 libxslt - mesa + libGLU_combined nspr nss openssl diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b6a4e7944d3c..e13f0001f02b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79b..15c251f38579 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -111,7 +111,7 @@ stdenv.mkDerivation { libcanberra_gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bfbd97001973..4d90d4c94d86 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip +, yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc , autoconf213, which, m4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { [ gtk2 zip libIDL libjpeg zlib bzip2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr nss libnotify xorg.pixman yasm mesa + nspr nss libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip hunspell libevent libstartup_notification /* cairo */ diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 59249d1a6eb0..c2a10d85eb1a 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python2, makeWrapper, lib -, mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: +, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: let version = "0.11.1"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8948d13cf7f..e0df9cae2ea6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -247,7 +247,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5070de5262e5..05c058960922 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libzmf , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -240,7 +240,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index fe6a3a41a236..328253c53437 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo +, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo , pango, gdk_pixbuf, atk }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua perl autoreconfHook ]; patchPhase = '' diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 190186db1810..d572dd55b2b2 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, mesa, libpng, lua5, autoconf, automake }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; - buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; + buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 32eaa37375f8..3c7af809b884 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl -, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - freetype libpng mesa openssl libiconv qtscript qtserialport qttools + freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools qtmultimedia qtlocation ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 878dfde8f4e2..78cda9d115ce 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; - buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; + buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ]; nativeBuildInputs = [ cmake pkgconfig doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; + NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; meta = { description = "Molecule editor and visualizer"; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index dc13f751b89f..8e98bad55c3d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; + buildInputs = [ cmake libGLU_combined wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index f954bf5b70ca..46689dfc9745 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -1,4 +1,4 @@ -{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, mesa, zlib +{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ - mesa zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs + libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost ] ++ optional (oceSupport) opencascade_oce ++ optional (ngspiceSupport) ngspice diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index f4418f535632..ea0ebd52b3eb 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, mesa, openssl, zlib }: +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }: stdenv.mkDerivation rec { name = "librepcb-${version}"; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 6b792310e8b4..34bdd3d47c86 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c9016a5ee0ce..c84f81740c79 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, +{stdenv, fetchurl, xlibs, cmake, subversion, libGLU_combined, qt5, boost, python27, python27Packages}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake mesa qt5.qtbase boost ]; + buildInputs = [ cmake libGLU_combined qt5.qtbase boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index b2b052bdb159..e29ff24e250f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null }: -assert enableGUI -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) ] ++ stdenv.lib.optionals enableGUI [ - mesa fltk xorg.libX11 + libGLU_combined fltk xorg.libX11 ]; outputs = [ "out" ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 67dcfd8dc1de..798141b6b438 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut , mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 31c4fe984770..96b800661a76 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, libGLU, xorg }: +, zlib, libGLU_combined, libGLU, xorg }: let version = "3.0.5"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa + buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index d8e8d49bb706..ff25bc974900 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }: +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 716d6d9687c5..a1b8769617c9 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, +libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; buildInputs = [ - curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver + curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 5fe72e44842d..5b210fa4bf6b 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, fetchgit -, wxGTK, perl, python2, zlib, mesa, libX11 +, wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoconf automake]; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; # Link against Python explicitly as it is needed for scripts diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index f4bf24a73433..8ecbf656a821 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}: +{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { baseName="golly"; version = "3.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; setSourceRoot = '' diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index c8f89c398b12..8b6c7497e547 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 + qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 676395d03d53..a7b3d2292be0 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash +, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; 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 ] ; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9b8035fcefe7..d2590bc0b8d4 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 +{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 , cmake, makeWrapper, libjpeg, python }: let version = "4.9.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; }; - buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 510c56b66c88..64482ddd74bc 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -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. let @@ -23,7 +23,7 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 mesa ]; + buildInputs = [ cmake qt4 libGLU_combined ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 13852261e863..e201add472bf 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { 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 { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa + glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost glm freetype ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ebc1249dc11d..ade81de2f04e 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype -, mesa +, libGLU_combined , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , icu, boost, intltool # New dependencies @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <unicode/unistr.h>' -i src/utils.cpp"; 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 ] ++ optional spellcheckSupport hunspell diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index a9e2654f731b..671d67946354 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which -, libX11, libxcb, mesa +, libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ libX11 libxcb - mesa + libGLU_combined qtbase qtx11extras qtdeclarative diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 28577a429bd2..ff5c590952ca 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -8,7 +8,7 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, alsaLib, mesa, glew, fontconfig, freetype, ftgl +, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto - alsaLib mesa glew fontconfig freetype ftgl + alsaLib libGLU_combined glew fontconfig freetype ftgl libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1e890c24db1a..a4b08e1ce47c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, openssl, qt4, mesa, zlib, pkgconfig, libav +, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; 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"; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index fe6090c3230e..f2d40c2ac808 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -2,7 +2,7 @@ , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? 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 , xvSupport ? true, libXv ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -32,7 +32,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != 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 xvSupport -> (libXv != null && x11Support); assert alsaSupport -> alsaLib != null; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext mesa ] + ++ optionals x11Support [ libX11 libXext libGLU_combined ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 403fc7e4ee11..c42afa69c41f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -4,7 +4,7 @@ , lua, lua5_sockets, libuchardet, libiconv ? null, darwin , x11Support ? true, - mesa ? null, + libGLU_combined ? null, libX11 ? null, libXext ? null, libXxf86vm ? null @@ -45,7 +45,7 @@ with stdenv.lib; let available = x: x != null; 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 rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; @@ -156,7 +156,7 @@ in stdenv.mkDerivation rec { ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] ++ optionals waylandSupport [ wayland libxkbcommon ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 167c5bdba40a..6f7ebb8c20af 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { 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 , yasm, libuuid, taglib, libtool, autoconf, automake, file }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; 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 libuuid taglib ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 75bd398b2080..5b9ae0119039 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { 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 { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa + alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined libpulseaudio qt4 ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 4ad8f0213261..f9d7128330fb 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, libtool -, gtk2, mesa, readline, libX11, libXpm +, gtk2, libGLU_combined, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true, ncurses ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; 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 sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 159468f79047..53bcd158aedd 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -1,5 +1,5 @@ { 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, libXrandr, libXrender, xwininfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { libdrm libxml2 libxslt - mesa + libGLU_combined pcre ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 0b78debdc589..bd40a73d264c 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -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 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; 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 libwebp wayland-protocols ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index fac97e72a6c3..fff15a9981d2 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,5 +1,5 @@ { 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 , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { 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 gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev systemd ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index d5be7137c8fa..3a316f71f082 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -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 { name = "gtkglext-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; - [ pkgconfig glib gtk mesa pango libX11 libXmu ]; + [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 152c1d98b8c8..63e33aa578ef 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -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 }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ]; + propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ]; meta = { description = "C++ wrappers for GtkGLExt"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 39897f824059..39ffd364c813 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -632,7 +632,7 @@ self: super: { phash = markBroken super.phash; # 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-fluid-examples = dontDistribute super.fltkhs-fluid-examples; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 03299d775f4f..bac5210953e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -221,7 +221,7 @@ self: super: builtins.intersectAttrs super { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # 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 # /homeless-shelter. Disabled. diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index eae4a50aa20e..1d2b79074fb4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport -, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport }: { baseName ? "erlang" @@ -17,7 +17,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] +, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -31,7 +31,7 @@ assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xorg != null); + else libGLU_combined != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 773a2c86028b..6c0568d68134 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, - ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, + ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype - mesa libpng libtiff libjpeg readline libsndfile libxml2 + libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl pkgconfig glfw openssl libpthreadstubs libXdmcp libmemcached python3 diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 255bd0351298..07ce9347cf70 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 114749e90da3..884225b6483e 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 4e999eca9eeb..5fbb34bf213a 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 83c485f065dd..425239af2242 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL2, mesa, openal, luajit +, SDL2, libGLU_combined, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 6958bd2465f5..9575409f9868 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL +{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xproto indent readline gsl freeglut mesa SDL blas libbfd + libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ab1dc4b5fe1d..c13d862267fb 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ]) ; # makeinfo is required by Octave at runtime to display help diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index cc3eba52bf2d..658c5aebe5cb 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib , glib }: @@ -26,13 +26,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cython wrapPython - SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib ]); buildPhase = '' diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index dc30fee954f6..108a11ece58b 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, xlibs, mesa }: +{ stdenv, fetchurl, unzip, xlibs, libGLU_combined }: stdenv.mkDerivation rec { name = "AntTweakBar-1.16"; - buildInputs = [ unzip xlibs.libX11 mesa ]; + buildInputs = [ unzip xlibs.libX11 libGLU_combined ]; src = fetchurl { url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index dc2775b1979d..30e0f9a09838 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac , inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined kbproto libjpeg flac inputproto libXi fixesproto libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index c0451486c144..12b2cbf07071 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa }: +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "allegro-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 61f0fac7ffd0..e65980be320e 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto +{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto , libXi, pkgconfig }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake mesa freeglut libX11 xproto inputproto libXi + unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 39a5a9869ba7..4d94faa9566a 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ (if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] - else [mesa freeglut]); + else [libGLU_combined freeglut]); patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 64b86d66913c..6aa184e4204e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, libGL ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true , darwin }: diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 2c50d8138057..ad233402f198 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto +{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto , inputproto, libXi, libXmu }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index b26327dd7754..7c44c2e0ab0c 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 3292c8e353fe..19f6729e1fca 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes +{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, gobjectIntrospection, gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango + [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json_glib gobjectIntrospection libxcb ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index ce78a6fc1347..442ed2a4b9a5 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa }: +{ fetchurl, stdenv, libGLU_combined }: stdenv.mkDerivation rec { name = "coin3d-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./sbhashentry.patch ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://www.coin3d.org/; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 18ce05af07a8..483300b13f57 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python -, mesa, libX11 +, libGLU_combined, libX11 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; - buildInputs = [ mesa libX11 ]; + buildInputs = [ libGLU_combined libX11 ]; preConfigure = stdenv.lib.optional stdenv.isDarwin '' substituteInPlace configure --replace build_glx=no build_glx=yes diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index af8258a01966..7b40359837a3 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang}: +{stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}: stdenv.mkDerivation rec { name = "esdl-1.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ erlang rebar ]; - propagatedBuildInputs = [ SDL mesa ]; + propagatedBuildInputs = [ SDL libGLU_combined ]; buildPhase = '' rebar compile diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 689b13a394dc..67e364715f09 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -102,7 +102,7 @@ #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering -, openglExtlib ? false, mesa ? null # OpenGL rendering +, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null @@ -225,7 +225,7 @@ assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> mesa != null; +assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; @@ -406,7 +406,7 @@ stdenv.mkDerivation rec { libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ] ++ optional openglExtlib mesa + ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 906a15c419d6..985f328a22dd 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -3,7 +3,7 @@ , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus , hostPlatform -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads @@ -60,7 +60,7 @@ let vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus - ] ++ optional openglSupport mesa + ] ++ optional openglSupport libGLU_combined ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional isLinux alsaLib diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a1e4bb8274e0..ddc962d0aab6 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng +, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , darwin, libtiff, freetype }: @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} { # this could be tidied up (?).. eg why does it require freeglut without glSupport? edf { name = "cygwin"; } # use the CygWin libraries default=no // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes + // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes // edf { name = "shared"; } # turn on shared libraries default=no // edf { name = "threads"; } # enable multi-threading support // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 63ec62336163..0d62656e6e74 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, mesa, libXft, libXfixes, xinput +, libXrandr, libGLU_combined, libXft, libXfixes, xinput , CoreServices }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft mesa libXfixes xinput + libXft libGLU_combined libXfixes xinput ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; doCheck = true; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index c77c3b3640b7..d6767a4cbd3b 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: +{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu }: stdenv.mkDerivation rec { name = "freenect-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx"; }; - buildInputs = [ libusb freeglut mesa libXi libXmu ]; + buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 432f51823451..8808af49f9e4 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, mesa}: +{stdenv, fetchurl, freetype, libGLU_combined}: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [ freetype mesa ]; + buildInputs = [ freetype libGLU_combined ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 64f51a56fd37..1980c633474f 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, mesa, freeglut, libX11, libXt, libXmu, libXi, libXext}: +{stdenv, fetchurl, libGLU_combined, freeglut, libX11, libXt, libXmu, libXi, libXext}: stdenv.mkDerivation { name = "gle-3.1.0"; - buildInputs = [mesa freeglut libX11 libXt libXmu libXi libXext]; + buildInputs = [libGLU_combined freeglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 35d97712fa40..59357bf6fb1b 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, freeglut, mesa, libXmu, libXext, libX11, libXi}: +{stdenv, fetchurl, freeglut, libGLU_combined, libXmu, libXext, libX11, libXi}: stdenv.mkDerivation { name = "glui-2.35"; - buildInputs = [freeglut mesa libXmu libXext libX11 libXi]; + buildInputs = [freeglut libGLU_combined libXmu libXext libX11 libXi]; preConfigure = ''cd src''; installPhase = '' mkdir -p "$out"/{bin,lib,share/glui/doc,include} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c033140d8dc3..3a115bbaf2c4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -6,7 +6,7 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, mesa, libintlOrEmpty, libgme +, libGLU_combined, libintlOrEmpty, libgme , openssl, x265, libxml2 }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau - libwebp xvidcore gnutls mesa + libwebp xvidcore gnutls libGLU_combined mjpegtools libgme openssl x265 libxml2 ] ++ libintlOrEmpty diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 2033c07d9527..8351cfd65b1e 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm +, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm , libvpx, python }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM - xorg.libICE mesa nasm libvpx python + xorg.libICE libGLU_combined nasm libvpx python ]; preConfigure = " diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 336f446cdf10..d28ae012e574 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }: +{ stdenv, fetchzip, libGLU_combined, unzip, libXrandr, libX11, libXxf86vm }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + buildInputs = [ unzip libGLU_combined libXrandr libX11 libXxf86vm ]; meta = { homepage = http://irrlicht.sourceforge.net/; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 2cf08e345758..1a7153f99e67 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 -, libXt, libXtst, libXi, mesa, webkit, libsoup, xorg +, libXt, libXtst, libXi, libGLU_combined, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index ee984a53b4c9..49e5bcdd9058 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, mesa +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined , libsndfile, portaudio, mysql, fontconfig }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-nls=yes" "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" - "--with-gl=${mesa}" + "--with-gl=${libGLU_combined}" "--with-mysql=${mysql.connector-c}" "--with-manpages=yes" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool gettext ]; buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.connector-c mandoc + bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index cc285979c6c1..ebcbdb23e9fb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }: +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGLU_combined_noglu, libX11, libXext, glproto }: # Git version is needed for EGL and GLES handling. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGLU_combined_noglu.driverLink}/share/glvnd/egl_vendor.d\"" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 93d8ced49cea..b291ec2fdf0b 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, mesa, libX11 +, libGLU_combined, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - mesa libX11 + libGLU_combined libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -28,9 +28,9 @@ mkDerivation rec { }; # Make sure libqtav finds its libGL dependancy at both link and run time - # by adding mesa to rpath. Not sure why it wasn't done automatically like - # the other libraries as `mesa` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGLU_combined` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; preFixup = '' mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 0374c7f89b7a..4e859c282276 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx, zlib }: +{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; - buildInputs = [ cmake SDL mesa upx zlib ]; + buildInputs = [ cmake SDL libGLU_combined upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 82aba6b89f5a..977570050158 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 387dbb22a816..aad8ae00c114 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { description = "A patent-free S3TC compatible implementation"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 79a5bef30fcf..f7d4fc3b3675 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, mesa ? null # OpenGL (required for vwebp) +, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format , jpegSupport ? true, libjpeg ? null # JPEG image format , tiffSupport ? true, libtiff ? null # TIFF image format @@ -14,7 +14,7 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -assert openglSupport -> ((freeglut != null) && (mesa != null)); +assert openglSupport -> ((freeglut != null) && (libGLU_combined != null)); assert pngSupport -> (libpng != null); assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut mesa ] + ++ optionals openglSupport [ freeglut libGLU_combined ] ++ optional pngSupport libpng ++ optional jpegSupport libjpeg ++ optional tiffSupport libtiff diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index a4dc7b5e93d1..9c1815f840b4 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, mesa, libX11, libXi }: +{ stdenv, requireFile, cmake, libGLU_combined, libX11, libXi }: let sourceInfo = rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; inherit (sourceInfo) name version; - buildInputs = [ cmake mesa libX11 libXi ]; + buildInputs = [ cmake libGLU_combined libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 90f154367643..8b756e338e48 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp +, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, openssl, fetchpatch }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp + ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp bctoolbox libXext libmatroska openssl ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 715d2cb90f47..f4a869255f8c 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, - boost, pkgconfig, withOgre ? false, ogre ? null, mesa ? null } : + boost, pkgconfig, withOgre ? false, ogre ? null, libGLU_combined ? null } : let renderSystem = if withOgre then "3" else "4"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else mesa) ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else libGLU_combined) ]; # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index b3b6e918bdea..694fbaa50c1c 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, lib -, cmake, mesa +, cmake, libGLU_combined , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake mesa + [ cmake libGLU_combined freetype freeimage zziplib randrproto libXrandr libXaw freeglut libXt libpng boost ois xproto libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e0d6d2fa41c7..0b7202459f9e 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, mesa +, cmake, libGLU_combined , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = - [ cmake mesa + [ cmake libGLU_combined freetype freeimage zziplib randrproto libXrandr libXaw freeglut libXt libpng boost ois xproto libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c2fba26ba686..6af15d90cefd 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, +{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4, ftgl, freetype}: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"; }; - buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; # Fix for glibc 2.26 postPatch = '' diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index c5f79b8613ec..22960d2c691f 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, freeglut, glew, libXmu, libXext, libX11 +{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; }; - buildInputs = [mesa freeglut glew libXmu libXext libX11]; + buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; doCheck = false; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index fcf4c2c2468f..d8198357c641 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + buildInputs = [ unzip re2 openfx zlib ilmbase libGLU_combined openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 4f93ed562115..18df541d955a 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + buildInputs = [ unzip cmake freeglut libGLU_combined zlib swig python doxygen xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2cb2dde33f7e..8e1ee8196c30 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio , qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null , withQt5 ? false , debug ? false }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa libpulseaudio ] + [ libGLU_combined libpulseaudio ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); nativeBuildInputs = diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2c07c1e08580..794d0b24c778 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -25,7 +25,7 @@ , motif ? null # motif or lesstif # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, mesa ? null +, libGLU_combined ? null , xlibsWrapper ? null , libXmu ? null }: @@ -40,7 +40,7 @@ assert enableQT -> qt != null; assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 4030be2996cc..c9e8c632c7f1 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, mesa, freeglut, SDL +{ fetchurl, fetchpatch, stdenv, libGLU_combined, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - mesa freeglut SDL + libGLU_combined freeglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 1bc4fd1085e1..174be6a8f53a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,7 +6,7 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, openglSupport ? false, mesa ? null, libXmu ? null +, openglSupport ? false, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: @@ -15,7 +15,7 @@ assert xrenderSupport -> xftSupport && libXrender != null; assert xrandrSupport -> libXrandr != null && randrproto != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; -assert openglSupport -> mesa != null && libXmu != null; +assert openglSupport -> libGLU_combined != null && libXmu != null; stdenv.mkDerivation { name = "qt-3.3.8"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { -qt-gif -I${xextproto}/include ${if openglSupport then "-dlopen-opengl - -L${mesa}/lib -I${mesa}/include + -L${libGLU_combined}/lib -I${mesa}/include -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 33e8d49454c1..84be9876c1cb 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, freetype, fontconfig, fribidi, libX11 }: +{ stdenv, fetchurl, libGLU_combined, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; - buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; + buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index d724ebbf3738..28b96d17aa60 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut +, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto - libICE libSM libXt libXmu mesa boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f248d65e2ed6..7119f76c55fd 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU_combined, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL gtk2 mesa ]; + buildInputs = [ SDL gtk2 libGLU_combined ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index f0089110c3c8..013af68cb6c4 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }: let libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1"; name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvdpau mesa libva ]; + buildInputs = [ libvdpau libGLU_combined libva ]; preConfigure = '' patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 5250b7815906..ddeecce21c61 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, mesa }: +{ stdenv, fetchFromGitHub, unzip, cmake, libGLU_combined }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake mesa ]; + buildInputs = [ unzip cmake libGLU_combined ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 5b0bdb4ee741..984a106236ce 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt +{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = if !stdenv.isDarwin - then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index d3e3163a8afe..b62e83349053 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls , gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn, libedit, readline, mesa, libintlOrEmpty +, libidn, libedit, readline, libGLU_combined, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) - ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] ++ optional stdenv.isLinux wayland; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 83c75dcfa8a1..9bb9f7986e6d 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib +{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU_combined aalib libvorbis libtheora speex perl ffmpeg flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 7775716a7122..d0e64a16fddf 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, mesa, xorg, +{ stdenv, fetchurl, makeWrapper, perl, libGLU_combined, xorg, version? "2.8", # What version samples? false # Should samples be installed }: @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; patchFlags = "-p0"; - buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; + buildInputs = [ makeWrapper perl libGLU_combined xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; doCheck = false; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index b766d9d9c31a..699af16cf041 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,6 +1,6 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig , includeSources @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio dbus.lib ]} \ + --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 98531eeb069e..3891ea4c6be2 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -47,7 +47,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index f54df0c17d40..427d0d5a0e14 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU_combined, freeglut, camlp4 } : let pname = "lablgl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ocaml findlib lablgtk freeglut camlp4]; - propagatedBuildInputs = [ mesa ]; + propagatedBuildInputs = [ libGLU_combined ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index b2e37344afc3..66cef77e5a94 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index b72b1851024a..82b3da7a37c4 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib # Create the script cat > "$out/bin/${cmd}" <<EOF @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { # # (stack protection is disabled above for gcc 4.8 compatibility.) nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ bash unzip glibc openssl gcc48 mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; + buildInputs = [ bash unzip glibc openssl gcc48 libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share libuuid ]; meta = with stdenv.lib; { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/vms.nix b/pkgs/development/pharo/vm/vms.nix index 5258f4f6e77b..9a7a1ebd06f6 100644 --- a/pkgs/development/pharo/vm/vms.nix +++ b/pkgs/development/pharo/vm/vms.nix @@ -1,4 +1,4 @@ -{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: +{ cmake, stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, fetchFromGitHub, makeWrapper} @args: let pharo-vm-build = import ./build-vm.nix args; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index e3c7e6bc14a6..51c57bb5c519 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pure, freeglut, mesa, xlibsWrapper }: +{ stdenv, fetchurl, pkgconfig, pure, freeglut, libGLU_combined, xlibsWrapper }: stdenv.mkDerivation rec { baseName = "gl"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pure freeglut mesa xlibsWrapper ]; + propagatedBuildInputs = [ pure freeglut libGLU_combined xlibsWrapper ]; makeFlags = "libdir=$(out)/lib prefix=$(out)/"; setupHook = ../generic-setup-hook.sh; diff --git a/pkgs/development/python-modules/pyftgl/default.nix b/pkgs/development/python-modules/pyftgl/default.nix index 117169a26121..a85837472255 100644 --- a/pkgs/development/python-modules/pyftgl/default.nix +++ b/pkgs/development/python-modules/pyftgl/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub, isPy3k -, boost, freetype, ftgl, mesa }: +, boost, freetype, ftgl, libGLU_combined }: buildPythonPackage rec { pname = "pyftgl"; @@ -17,7 +17,7 @@ buildPythonPackage rec { sed -i "s,'boost_python','boost_python3',g" setup.py ''; - buildInputs = [ boost freetype ftgl mesa ]; + buildInputs = [ boost freetype ftgl libGLU_combined ]; meta = with stdenv.lib; { description = "Python bindings for FTGL (FreeType for OpenGL)"; diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 8ac066500a4c..3fc7f8ddb683 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchPypi -, mesa, xorg, freetype, fontconfig, future}: +, libGLU_combined, xorg, freetype, fontconfig, future}: buildPythonPackage rec { version = "1.3.1"; @@ -11,7 +11,7 @@ buildPythonPackage rec { }; postPatch = let - libs = [ mesa xorg.libX11 freetype fontconfig ]; + libs = [ libGLU_combined xorg.libX11 freetype fontconfig ]; paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9ff7d1da71b2..3ad2176fb419 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -310,7 +310,7 @@ let rgdal = [ pkgs.proj pkgs.gdal ]; rgeos = [ pkgs.geos ]; rggobi = [ pkgs.ggobi pkgs.gtk2.dev pkgs.libxml2.dev ]; - rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; + rgl = [ pkgs.libGLU_combined pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; diff --git a/pkgs/development/tools/godot/pkg_config_additions.patch b/pkgs/development/tools/godot/pkg_config_additions.patch index c4675322e2b3..2302710ac7e4 100644 --- a/pkgs/development/tools/godot/pkg_config_additions.patch +++ b/pkgs/development/tools/godot/pkg_config_additions.patch @@ -4,7 +4,7 @@ env.ParseConfig('pkg-config xcursor --cflags --libs') env.ParseConfig('pkg-config xrandr --cflags --libs') + env.ParseConfig('pkg-config xrender --cflags --libs') -+ env.ParseConfig('pkg-config osmesa --cflags') ++ env.ParseConfig('pkg-config oslibGLU_combined --cflags') + env.ParseConfig('pkg-config glu --cflags --libs') + env.ParseConfig('pkg-config zlib --cflags --libs') diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix index e3dda5094275..b009d5ed601b 100644 --- a/pkgs/development/tools/simavr/default.nix +++ b/pkgs/development/tools/simavr/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, avrbinutils, avrgcc, avrlibc, libelf, which, git, pkgconfig, freeglut -, mesa }: +, libGLU_combined }: stdenv.mkDerivation rec { name = "simavr-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut mesa ]; + buildInputs = [ which git avrbinutils avrgcc avrlibc libelf freeglut libGLU_combined ]; meta = with stdenv.lib; { description = "A lean and mean Atmel AVR simulator"; diff --git a/pkgs/games/0ad/game.nix b/pkgs/games/0ad/game.nix index a056f5880a4c..4d5a4fe8379c 100644 --- a/pkgs/games/0ad/game.nix +++ b/pkgs/games/0ad/game.nix @@ -1,7 +1,7 @@ { stdenv, lib, callPackage, perl, fetchurl, python2 , pkgconfig, spidermonkey_38, boost, icu, libxml2, libpng , libjpeg, zlib, curl, libogg, libvorbis, enet, miniupnpc -, openal, mesa, xproto, libX11, libXcursor, nspr, SDL, SDL2 +, openal, libGLU_combined, xproto, libX11, libXcursor, nspr, SDL, SDL2 , gloox, nvidia-texture-tools , withEditor ? true, wxGTK ? null }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ spidermonkey_38 boost icu libxml2 libpng libjpeg zlib curl libogg libvorbis enet miniupnpc openal - mesa xproto libX11 libXcursor nspr SDL2 gloox + libGLU_combined xproto libX11 libXcursor nspr SDL2 gloox nvidia-texture-tools ] ++ lib.optional withEditor wxGTK; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index 016c965b6c0b..fd575975fed5 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, libpulseaudio +{ stdenv, fetchurl, patchelf, zlib, libmad, libpng12, libcaca, libGLU_combined, alsaLib, libpulseaudio , xorg }: assert stdenv.system == "x86_64-linux"; @@ -7,7 +7,7 @@ let inherit (xorg) libXext libX11; lpath = "${stdenv.cc.cc.lib}/lib64:" + stdenv.lib.makeLibraryPath [ - zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib libpulseaudio]; + zlib libmad libpng12 libcaca libXext libX11 libGLU_combined alsaLib libpulseaudio]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/alienarena/default.nix b/pkgs/games/alienarena/default.nix index 0c95aa988943..1b23d1ccd6d2 100644 --- a/pkgs/games/alienarena/default.nix +++ b/pkgs/games/alienarena/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libjpeg, libX11, libXxf86vm, curl, libogg -, libvorbis, freetype, openal, mesa }: +, libvorbis, freetype, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "alienarena-7.65"; @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libjpeg libX11 curl libogg libvorbis - freetype openal mesa libXxf86vm ]; + freetype openal libGLU_combined libXxf86vm ]; patchPhase = '' substituteInPlace ./configure \ --replace libopenal.so.1 ${openal}/lib/libopenal.so.1 \ - --replace libGL.so.1 ${mesa}/lib/libGL.so.1 + --replace libGL.so.1 ${libGLU_combined}/lib/libGL.so.1 ''; meta = with stdenv.lib; { diff --git a/pkgs/games/armagetronad/default.nix b/pkgs/games/armagetronad/default.nix index 0fb75b3d345b..5318108c4913 100644 --- a/pkgs/games/armagetronad/default.nix +++ b/pkgs/games/armagetronad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, mesa, zlib }: +{ stdenv, fetchurl, SDL, libxml2, SDL_image, libjpeg, libpng, libGLU_combined, zlib }: let versionMajor = "0.2.8"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; configureFlags = [ "--disable-etc" ]; - buildInputs = [ SDL SDL_image libxml2 libjpeg libpng mesa zlib ]; + buildInputs = [ SDL SDL_image libxml2 libjpeg libpng libGLU_combined zlib ]; meta = with stdenv.lib; { homepage = http://armagetronad.org; diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix index e6594adde552..e000f743173b 100644 --- a/pkgs/games/arx-libertatis/default.nix +++ b/pkgs/games/arx-libertatis/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, boost, - openal, glm, freetype, mesa, glew, SDL2, + openal, glm, freetype, libGLU_combined, glew, SDL2, dejavu_fonts, inkscape, optipng, imagemagick }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake zlib boost openal glm - freetype mesa glew SDL2 inkscape + freetype libGLU_combined glew SDL2 inkscape optipng imagemagick ]; diff --git a/pkgs/games/astromenace/default.nix b/pkgs/games/astromenace/default.nix index 0a7218bba72c..737f31d6e105 100644 --- a/pkgs/games/astromenace/default.nix +++ b/pkgs/games/astromenace/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, xlibsWrapper, mesa, SDL, openal, freealut, libogg, libvorbis }: +{ fetchurl, stdenv, cmake, xlibsWrapper, libGLU_combined, SDL, openal, freealut, libogg, libvorbis }: stdenv.mkDerivation rec { version = "1.3.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rkz6lwjcd5mwv72kf07ghvx6z46kf3xs250mjbmnmjpn7r5sxwv"; }; - buildInputs = [ cmake xlibsWrapper mesa SDL openal freealut libogg libvorbis ]; + buildInputs = [ cmake xlibsWrapper libGLU_combined SDL openal freealut libogg libvorbis ]; buildPhase = '' cmake ./ diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix index 95d6365b99db..94a1e6ee91ab 100644 --- a/pkgs/games/bitsnbots/default.nix +++ b/pkgs/games/bitsnbots/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, lua, mesa }: +{ stdenv, fetchurl, SDL, lua, libGLU_combined }: stdenv.mkDerivation rec { name = "bitsnbots-20111230"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ln -s $out/share/${name}/bitsnbots $out/bin ''; - buildInputs = [ SDL lua mesa ]; + buildInputs = [ SDL lua libGLU_combined ]; meta = { description = "Simple puzzle game with moving robots"; diff --git a/pkgs/games/blackshades/default.nix b/pkgs/games/blackshades/default.nix index 42a1b19c4d7a..4b874c954b0a 100644 --- a/pkgs/games/blackshades/default.nix +++ b/pkgs/games/blackshades/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image}: +{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image}: stdenv.mkDerivation rec { name = "blackshades-svn-110"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lSDL_image"; - buildInputs = [ SDL SDL_image mesa openal libvorbis freealut ]; + buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut ]; patchPhase = '' sed -i -e s,Data/,$out/opt/$name/Data/,g \ diff --git a/pkgs/games/blackshadeselite/default.nix b/pkgs/games/blackshadeselite/default.nix index d7e2cf4894dd..2f503e02ec20 100644 --- a/pkgs/games/blackshadeselite/default.nix +++ b/pkgs/games/blackshadeselite/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchsvn, SDL, mesa, openal, libvorbis, freealut, SDL_image, popt}: +{stdenv, fetchsvn, SDL, libGLU_combined, openal, libvorbis, freealut, SDL_image, popt}: stdenv.mkDerivation rec { name = "blackshades-elite-svn-29"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lSDL_image"; NIX_CFLAGS_COMPILE = "-fpermissive"; - buildInputs = [ SDL SDL_image mesa openal libvorbis freealut popt ]; + buildInputs = [ SDL SDL_image libGLU_combined openal libvorbis freealut popt ]; patchPhase = '' sed -i -e s,Data/,$out/opt/$name/Data/,g \ diff --git a/pkgs/games/blobby/default.nix b/pkgs/games/blobby/default.nix index 35f5699a231b..35a2bfaed803 100644 --- a/pkgs/games/blobby/default.nix +++ b/pkgs/games/blobby/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL2, SDL2_image, mesa, cmake, physfs, boost, zip, zlib +{stdenv, fetchurl, SDL2, SDL2_image, libGLU_combined, cmake, physfs, boost, zip, zlib , pkgconfig, unzip}: stdenv.mkDerivation rec { version = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [SDL2 SDL2_image mesa cmake physfs boost zip zlib + buildInputs = [SDL2 SDL2_image libGLU_combined cmake physfs boost zip zlib unzip]; preConfigure='' diff --git a/pkgs/games/btanks/default.nix b/pkgs/games/btanks/default.nix index 3f490b2976c1..8379e1aa7bb2 100644 --- a/pkgs/games/btanks/default.nix +++ b/pkgs/games/btanks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, mesa, zlib, smpeg +{ stdenv, fetchurl, fetchpatch, scons, pkgconfig, SDL, libGLU_combined, zlib, smpeg , SDL_image, libvorbis, expat, zip, lua5_1 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ scons pkgconfig ]; - buildInputs = [ SDL mesa zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; + buildInputs = [ SDL libGLU_combined zlib smpeg SDL_image libvorbis expat zip lua5_1 ]; NIX_CFLAGS_COMPILE = "-I${SDL_image}/include/SDL"; diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index 9962e0e71054..332e84402bb1 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig -, curl, SDL2, mesa, glew, ncurses, c-ares }: +, curl, SDL2, libGLU_combined, glew, ncurses, c-ares }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ curl SDL2 mesa glew ncurses c-ares ]; + buildInputs = [ curl SDL2 libGLU_combined glew ncurses c-ares ]; meta = with lib; { description = "Multiplayer 3D Tank game"; diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 0c9e83cdb9ab..cfcf057dd1ab 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, zlib, xproto, mesa ? null, freeglut ? null }: +{ stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }: stdenv.mkDerivation rec { name = "construo-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xproto ] - ++ stdenv.lib.optional (mesa != null) mesa + ++ stdenv.lib.optional (libGLU_combined != null) mesa ++ stdenv.lib.optional (freeglut != null) freeglut; preConfigure = '' diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index 3fceb796dde5..d8de785ef1f8 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, mesa, libXi, libXmu}: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, libGLU_combined, libXi, libXmu}: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 freeglut SDL mesa libXi libXmu ]; + buildInputs = [ gtk2 freeglut SDL libGLU_combined libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 430da66c21c5..3dae66255a3f 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses -, dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype, pngcrush, advancecomp +, dejavu_fonts, libpng, SDL2, SDL2_image, libGLU_combined, freetype, pngcrush, advancecomp , tileMode ? false }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # Still unstable with luajit buildInputs = [ lua5_1 zlib sqlite ncurses ] - ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype mesa ]; + ++ lib.optionals tileMode [ libpng SDL2 SDL2_image freetype libGLU_combined ]; preBuild = '' cd crawl-ref/source diff --git a/pkgs/games/crrcsim/default.nix b/pkgs/games/crrcsim/default.nix index 5d387e19928e..98baafbb2fd2 100644 --- a/pkgs/games/crrcsim/default.nix +++ b/pkgs/games/crrcsim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, SDL_mixer, plib, libjpeg }: +{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, plib, libjpeg }: let version = "0.9.13"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa SDL SDL_mixer plib libjpeg + libGLU_combined SDL SDL_mixer plib libjpeg ]; patches = [ diff --git a/pkgs/games/dhewm3/default.nix b/pkgs/games/dhewm3/default.nix index 4bae8e1d58ad..0d0cb8a11fdd 100644 --- a/pkgs/games/dhewm3/default.nix +++ b/pkgs/games/dhewm3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, mesa, zlib, libjpeg, libogg, libvorbis +{ stdenv, fetchFromGitHub, cmake, SDL2, libGLU_combined, zlib, libjpeg, libogg, libvorbis , openal, curl }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1s64xr1ir4d2z01fhldy577b0x80nd1k6my7y1hxp57lggr8dy5y"; }; - # Add mesa linking + # Add libGLU_combined linking patchPhase = '' sed -i 's/\<idlib\()\?\)$/idlib GL\1/' neo/CMakeLists.txt ''; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL2 mesa zlib libjpeg libogg libvorbis openal curl ]; + buildInputs = [ SDL2 libGLU_combined zlib libjpeg libogg libvorbis openal curl ]; enableParallelBuilding = true; diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix index 71938874057a..58ca2e40246e 100644 --- a/pkgs/games/dwarf-fortress/dfhack/default.nix +++ b/pkgs/games/dwarf-fortress/dfhack/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchgit, cmake, writeScriptBin, callPackage , perl, XMLLibXML, XMLLibXSLT, zlib -, enableStoneSense ? false, allegro5, mesa +, enableStoneSense ? false, allegro5, libGLU_combined }: let @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ]; # We don't use system libraries because dfhack needs old C++ ABI. buildInputs = [ zlib ] - ++ lib.optionals enableStoneSense [ allegro5 mesa ]; + ++ lib.optionals enableStoneSense [ allegro5 libGLU_combined ]; preConfigure = '' # Trick build system into believing we have .git diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index 9645a89b3b2c..cea07d873ab4 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, scons, pkgconfig -, SDL, SDL_mixer, mesa, physfs +, SDL, SDL_mixer, libGLU_combined, physfs }: let @@ -19,7 +19,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig scons ]; - buildInputs = [ mesa physfs SDL SDL_mixer ]; + buildInputs = [ libGLU_combined physfs SDL SDL_mixer ]; enableParallelBuilding = true; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 42a3339594a5..733b6070b1fc 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, mesa, nasm +{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, libGLU_combined, nasm , pkgconfig, SDL2, SDL2_mixer }: let @@ -14,14 +14,14 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk2 libvorbis libvpx mesa SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx libGLU_combined SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; nativeBuildInputs = [ pkgconfig ]; postPatch = '' substituteInPlace build/src/glbuild.c \ - --replace libGL.so ${mesa}/lib/libGL.so \ - --replace libGLU.so ${mesa}/lib/libGLU.so + --replace libGL.so ${libGLU_combined}/lib/libGL.so \ + --replace libGLU.so ${libGLU_combined}/lib/libGLU.so ''; NIX_CFLAGS_COMPILE = "-I${SDL2.dev}/include/SDL2 -I${SDL2_mixer}/include/SDL2"; diff --git a/pkgs/games/egoboo/default.nix b/pkgs/games/egoboo/default.nix index 96ff52446ec4..29ad352c3168 100644 --- a/pkgs/games/egoboo/default.nix +++ b/pkgs/games/egoboo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, SDL_mixer, SDL_image, SDL_ttf }: +{ stdenv, fetchurl, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_ttf }: stdenv.mkDerivation rec { # pf5234 (a developer?) at freenode #egoboo told me that I better use 2.7.3 until @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp -v -Rd controls.txt setup.txt players modules basicdat $out/share/${name} ''; - buildInputs = [ mesa SDL SDL_mixer SDL_image SDL_ttf ]; + buildInputs = [ libGLU_combined SDL SDL_mixer SDL_image SDL_ttf ]; /* This big commented thing may be needed for versions 2.8.0 or beyond diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index a830fa38df55..d1bf190be574 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut, freetype +{ stdenv, fetchurl, libGLU_combined, libX11, xproto, tcl, freeglut, freetype , sfml, libXi, inputproto , libXmu, libXext, xextproto, libXt, libSM, libICE , libpng, pkgconfig, gettext, intltool @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa libX11 xproto tcl freeglut freetype + libGLU_combined libX11 xproto tcl freeglut freetype sfml libXi inputproto libXmu libXext xextproto libXt libSM libICE libpng pkgconfig gettext intltool diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 2c544abddd07..2684a56a8286 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, curl, expat -, jansson, libpng, libjpeg, mesa, pcre +, jansson, libpng, libjpeg, libGLU_combined, pcre , pkgconfig, SDL2, vimNox }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - expat curl jansson libpng libjpeg mesa pcre SDL2 vimNox + expat curl jansson libpng libjpeg libGLU_combined pcre SDL2 vimNox ]; installPhase = with stdenv.lib; let diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix index 743194269917..b7a4af54929d 100644 --- a/pkgs/games/flightgear/default.nix +++ b/pkgs/games/flightgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper -, freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib +, freeglut, freealut, libGLU_combined, libICE, libjpeg, openal, openscenegraph, plib , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr , makeDesktopItem, qtbase, qtdeclarative, glew @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - freeglut freealut mesa libICE libjpeg openal openscenegraph plib + freeglut freealut libGLU_combined libICE libjpeg openal openscenegraph plib libSM libunwind libX11 xproto libXext xextproto libXi inputproto libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase glew qtdeclarative diff --git a/pkgs/games/freeorion/default.nix b/pkgs/games/freeorion/default.nix index 61a1aed8178f..3d7e132e6122 100644 --- a/pkgs/games/freeorion/default.nix +++ b/pkgs/games/freeorion/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, doxygen, graphviz, makeWrapper -, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, mesa, glew, libxslt }: +, boost, SDL2, python2, freetype, openal, libogg, libvorbis, zlib, libpng, libtiff, libjpeg, libGLU_combined, glew, libxslt }: stdenv.mkDerivation rec { version = "0.4.7.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1m05l3a6ilqd7p2g3aqjpq89grb571cg8n9bpgz0y3sxskcym6sp"; }; - buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg mesa glew ]; + buildInputs = [ boost SDL2 python2 freetype openal libogg libvorbis zlib libpng libtiff libjpeg libGLU_combined glew ]; nativeBuildInputs = [ cmake doxygen graphviz makeWrapper ]; diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index 114eaa3027b0..d7487c22e28e 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libGLU_combined, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 glib mesa wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib libGLU_combined wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gl-117/default.nix b/pkgs/games/gl-117/default.nix index 49f61a2f2bca..f654dfc1573f 100644 --- a/pkgs/games/gl-117/default.nix +++ b/pkgs/games/gl-117/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, mesa, SDL, freeglut, SDL_mixer, autoconf, automake, libtool +, libGLU_combined, SDL, freeglut, SDL_mixer, autoconf, automake, libtool }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yvg1rp1yijv0b45cz085b29x5x0g5fkm654xdv5qwh2l6803gb4"; }; - buildInputs = [ mesa SDL freeglut SDL_mixer autoconf automake libtool ]; + buildInputs = [ libGLU_combined SDL freeglut SDL_mixer autoconf automake libtool ]; meta = { description = "An air combat simulator"; diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index 49353f5d7b5b..4bcf6cffa165 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net +{ stdenv, fetchurl, libGLU_combined, SDL, scons, SDL_ttf, SDL_image, zlib, SDL_net , speex, libvorbis, libogg, boost, fribidi, bsdiff , fetchpatch }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sed -i -e "s@env = Environment()@env = Environment( ENV = os.environ )@" SConstruct ''; - buildInputs = [ mesa SDL scons SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; + buildInputs = [ libGLU_combined SDL scons SDL_ttf SDL_image zlib SDL_net speex libvorbis libogg boost fribidi bsdiff ]; buildPhase = '' scons diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index 77d122b36117..6ede118526d8 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, zlib, libpng, libvorbis, libmikmod, SDL_sound } : +{stdenv, fetchurl, SDL, libGLU_combined, zlib, libpng, libvorbis, libmikmod, SDL_sound } : stdenv.mkDerivation rec { name = "gltron-0.70"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { # The build fails, unless we disable the default -Wall -Werror configureFlags = "--disable-warn"; - buildInputs = [ SDL mesa zlib libpng libvorbis libmikmod SDL_sound ]; + buildInputs = [ SDL libGLU_combined zlib libpng libvorbis libmikmod SDL_sound ]; meta = { homepage = http://www.gltron.org/; diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index 2145ee013561..2196fede32fc 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -1,6 +1,6 @@ { SDL2_image, SDL2_ttf, SDL2_net, fpc, qt4, ghcWithPackages, ffmpeg, freeglut , stdenv, makeWrapper, fetchurl, cmake, pkgconfig, lua5_1, SDL2, SDL2_mixer -, zlib, libpng, mesa, physfs +, zlib, libpng, libGLU_combined, physfs }: let @@ -35,13 +35,13 @@ stdenv.mkDerivation rec { -rpath ${SDL2.out}/lib -rpath ${libpng.out}/lib -rpath ${lua5_1}/lib - -rpath ${mesa}/lib + -rpath ${libGLU_combined}/lib -rpath ${zlib.out}/lib " ''; postInstall = '' - wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ mesa freeglut physfs ]} + wrapProgram $out/bin/hwengine --prefix LD_LIBRARY_PATH : $LD_LIBRARY_PATH:${stdenv.lib.makeLibraryPath [ libGLU_combined freeglut physfs ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/games/kobodeluxe/default.nix b/pkgs/games/kobodeluxe/default.nix index 2c45e1361b40..b6d14085351e 100644 --- a/pkgs/games/kobodeluxe/default.nix +++ b/pkgs/games/kobodeluxe/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_image, mesa} : +{stdenv, fetchurl, SDL, SDL_image, libGLU_combined} : stdenv.mkDerivation { name = "kobodeluxe-0.5.1"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c"; }; - buildInputs = [ SDL SDL_image mesa ]; + buildInputs = [ SDL SDL_image libGLU_combined ]; prePatch = '' sed -e 's/char \*tok/const char \*tok/' -i graphics/window.cpp diff --git a/pkgs/games/lincity/ng.nix b/pkgs/games/lincity/ng.nix index 8004aa9931de..a5142dba88fd 100644 --- a/pkgs/games/lincity/ng.nix +++ b/pkgs/games/lincity/ng.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, jam, pkgconfig -, zlib, libxml2, libxslt, xproto, libX11, mesa, SDL +, zlib, libxml2, libxslt, xproto, libX11, libGLU_combined, SDL , SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, physfs }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - zlib libxml2 libxslt xproto libX11 mesa SDL SDL_mixer SDL_image + zlib libxml2 libxslt xproto libX11 libGLU_combined SDL SDL_mixer SDL_image SDL_ttf SDL_gfx physfs ]; diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix index b072fa942b86..53556b8cd914 100644 --- a/pkgs/games/liquidwar/default.nix +++ b/pkgs/games/liquidwar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xproto, libX11, libXrender -, gmp, mesa, libjpeg, libpng +, gmp, libGLU_combined, libjpeg, libpng , expat, gettext, perl, guile , SDL, SDL_image, SDL_mixer, SDL_ttf , curl, sqlite @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xproto libX11 gmp guile - mesa libjpeg libpng + libGLU_combined libjpeg libpng expat gettext perl SDL SDL_image SDL_mixer SDL_ttf curl sqlite diff --git a/pkgs/games/mars/default.nix b/pkgs/games/mars/default.nix index 57e260508246..2d2a31dd812c 100644 --- a/pkgs/games/mars/default.nix +++ b/pkgs/games/mars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, mesa, sfml, fribidi, taglib }: +{ stdenv, fetchgit, cmake, libGLU_combined, sfml, fribidi, taglib }: stdenv.mkDerivation rec { name = "mars-${version}-${rev}"; version = "0.7.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { inherit rev; sha256 = "1r4c5gap1z2zsv4yjd34qriqkxaq4lb4rykapyzkkdf4g36lc3nh"; }; - buildInputs = [ cmake mesa sfml fribidi taglib ]; + buildInputs = [ cmake libGLU_combined sfml fribidi taglib ]; patches = [ ./unbind_fix.patch ./fix-gluortho2d.patch diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix index ebf04ec75363..e59181bb0fa0 100644 --- a/pkgs/games/minecraft/default.nix +++ b/pkgs/games/minecraft/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeDesktopItem , jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm , openjdk -, mesa, openal +, libGLU_combined, openal , useAlsa ? false, alsaOss ? null }: with stdenv.lib; @@ -36,7 +36,7 @@ in stdenv.mkDerivation { cat > $out/bin/minecraft << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]} + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libGLU_combined openal ]} ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 49750997a904..fee8919bb236 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, sqlite, luajit , freetype, gettext, doxygen, ncurses, leveldb }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 buildInputs = [ - cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm libGLU_combined openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses leveldb ]; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 3fd20e6221e6..d8a4e32faaab 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, mesa, makeWrapper, zlib, freetype }: +, libpng, libGLU_combined, makeWrapper, zlib, freetype }: let pname = "naev"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib freetype ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU_combined zlib freetype ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 7bbc797b4f16..0fe9d1ee0f57 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, mesa }: +{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: stdenv.mkDerivation rec { name = "newtonwars-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut mesa ]; + buildInputs = [ makeWrapper freeglut libGLU_combined ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nw \ --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ - --prefix LD_LIBRARY_PATH ":" ${mesa}/lib + --prefix LD_LIBRARY_PATH ":" ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index bde567a19033..39b3ae36f506 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { # required for both unzip # glx - libX11 mesa libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl SDL ]; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 6dd098ee7b8e..5a8a8d244bf6 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml mesa bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index bf451af9ad73..30470e98c58d 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2018.01.28"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU_combined openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 9704cb93e6b4..68257fc9e9e4 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig -, mesa}: +, libGLU_combined}: let s = # Generated upstream information rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index c0053088db76..e6989908c65f 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig -, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa +, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp mesa ]; + buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp libGLU_combined ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 95ad53cb1ae3..4babc1caea5a 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, mesa}: +{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}: stdenv.mkDerivation { name = "prboom-2.5.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; - buildInputs = [ SDL SDL_mixer SDL_net mesa ]; + buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ]; crossAttrs = { propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ]; configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index e3116ae6e9da..f6f3e6001825 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, mesa, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU_combined, openal, pixman, pkgconfig, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal + libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU_combined openal pixman pkgconfig python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index d94a1f9a8d4d..70e330fa1ce4 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft +{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, libGLU_combined, openalSoft , curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ xlibsWrapper SDL2 libGLU_combined openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; enableParallelBuilding = true; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index d916ff0d3444..d0f1d500eaf5 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null }: -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport mesa; + ++ optional openglSupport libGLU_combined; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 0d0602524e79..a038957f701e 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, +{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost + buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU_combined boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 61a9310ae212..f48736a56d60 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, mesa, SDL, SDL_image, SDL_mixer +{ stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer , libpng, zlib, libjpeg, imagemagick, libX11 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick + libGLU_combined SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick libX11 ]; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 0c2952696e2c..430b22c9ba97 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ stdenv, fetchurl, libGLU_combined, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU_combined glew openalSoft freealut wxGTK libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 29b44f9d8576..fcde5b5ea59f 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, nasm -, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, mesa, SDL2, zlib +, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib , hostPlatform }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = [ - alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis mesa SDL2 zlib + alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib ]; enableParallelBuilding = true; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 96a38a10c6c8..8d102e98433b 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake -, boost, eigen2, lua, luabind, mesa, SDL }: +, boost, eigen2, lua, luabind, libGLU_combined, SDL }: stdenv.mkDerivation rec { name = "soi-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost lua luabind mesa SDL ]; + buildInputs = [ boost lua luabind libGLU_combined SDL ]; cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index e41ecf16136f..162db9672699 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, mesa, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU_combined, libXi, libXt, libXext, libX11, libXmu, freeglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ mesa libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU_combined libXi libXt libXext libX11 libXmu freeglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index cb7a345900af..10ce55f4e217 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 enet libjpeg openscenegraph libvorbis ]; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 40e97567d394..3bb69359f162 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 74d9bdcb35dc..5130db6cb3c8 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11 -, libXi, inputproto, libXmu, libXext, xextproto, mesa }: +, libXi, inputproto, libXmu, libXext, xextproto, libGLU_combined }: stdenv.mkDerivation rec { name = "stardust-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libtiff libxml2 SDL xproto libX11 libXi inputproto - libXmu libXext xextproto mesa + libXmu libXext xextproto libGLU_combined ]; installFlags = [ "bindir=\${out}/bin" ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index df5d7e7b4fa8..a7b82b8913f5 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig -, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype +, openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr - openal freealut mesa libvorbis libogg zlib freetype + openal freealut libGLU_combined libvorbis libogg zlib freetype curl fribidi bluez libjpeg libpng ]; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index bb297c1af4ee..cf6ba4648687 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl -, libogg, libvorbis, mesa, openal, boost, glew +, libogg, libvorbis, libGLU_combined, openal, boost, glew }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 3594a04f03bf..e5bb211eb227 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, glibc, libX11, mesa }: +{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; assert stdenv.isi686; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 mesa ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU_combined ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 50ffb693f70b..19be3f64045d 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU_combined }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0y5y8xzfsjd0rxl5wnxdq7m9n97s5xvcqyjsckz4qxrjcc3lk297"; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ]; + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ]; meta = { homepage = https://trackballs.github.io/; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index f62a9976fe3e..ce30be7be0b9 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz"; sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql"; }; - buildInputs = [ unzip mesa libX11 SDL openal ]; + buildInputs = [ unzip libGLU_combined libX11 SDL openal ]; unpackPhase = '' unzip $src1 cd tremulous diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index df005af39e57..fc6a45ace57b 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, mesa, glew }: +{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "095s4sx0s1ijlarkh84rvzlv4nxh9llrsal1lb3m3pf0v228gnzj"; }; - buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib mesa glew ]; + buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU_combined glew ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 0d909e1c43c1..f699a6a05c62 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer +{ stdenv, fetchurl, libtheora, xvidcore, libGLU_combined, SDL, SDL_ttf, SDL_mixer , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; buildInputs = [ - libtheora xvidcore mesa SDL SDL_ttf SDL_mixer + libtheora xvidcore libGLU_combined SDL SDL_ttf SDL_mixer curl libjpeg libpng gettext cunit ]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index ce0fc3f6c90f..63da46854857 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, SDL_image, freealut, openal, libvorbis, +{stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis, pkgconfig}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL mesa SDL_image freealut openal libvorbis ]; + buildInputs = [ SDL libGLU_combined SDL_image freealut openal libvorbis ]; postPatch = '' sed -e '1i#include <unistd.h>' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 67991987c311..2e9b3cf8d8ca 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,13 +1,13 @@ { stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , lua, fpc, pcre, portaudio, freetype, libpng , SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, mesa }: +, ffmpeg, sqlite, zlib, libX11, libGLU_combined }: let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 mesa ffmpeg + sqlite lua zlib libX11 libGLU_combined ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index af50759fd2fe..5ea84b9ef41f 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, SDL, libjpeg, libpng, glew, libwebp, ncurses +{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses , gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore , makeWrapper }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; }; - buildInputs = [ cmake mesa SDL libjpeg libpng glew libwebp ncurses gmp curl + buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl nettle openal speex libogg libvorbis libtheora xvidcore makeWrapper ]; preConfigure = ''prefix="$prefix/opt"''; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d8dcdf6b7b60..dd60c0efb599 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, mesa +{ stdenv, lib, fetchurl, pkgconfig, libGLU_combined , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod mesa ]; + buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU_combined ]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index bc293a881079..ceea9b3e158b 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }: +{ stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; + buildInputs = [ unzip SDL libGLU_combined openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 81b95ddb9e1c..ce20d1b3f177 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin , data ? fetchsvn { @@ -20,7 +20,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + buildInputs = [ scons libGLU_combined SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index c3ec47273d8f..9990c9108c49 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig + libXxf86vm libGLU_combined openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 85246aea2d5f..3e1729e20915 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, libGLU_combined, openal, freetype , makeWrapper }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper + libXxf86dga libXxf86vm libXinerama SDL libGLU_combined openal makeWrapper ]; installPhase = '' dest=$out/opt/warsow @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/warsow/warsow.* cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p ''; meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ba887d91de19..6cad72a44045 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,5 +1,5 @@ { stdenv, config, requireFile, fetchurl -, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa +, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined , demo ? false }: # TODO: add i686 support @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ] + + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; installPhase = '' diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7d4f2e53a941..ea70049c6c44 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net +, libpng, freeglut, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_net , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + freeglut libGLU_combined SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 531560fd309e..7fd5612bf886 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -2,7 +2,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl, patchelf , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib , # sdl SDL2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # required for both unzip libjpeg # glx - libX11 mesa libXpm libXext libXxf86vm alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm alsaLib # sdl SDL2 zlib libvorbis curl diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 90c1ad6f8ebc..cd927a820aaa 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }: +{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 SDL SDL_ttf SDL_image mesa expat zlib + libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; NIX_LDFLAGS = [ "-lX11" ]; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 514dd2f41db4..86412c0fa768 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}: +{stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf, SDL_image, zlib}: let buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib + libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index df58304b38d8..377741ef5447 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage -, soundfont-fluid, SDL, mesa, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 +, soundfont-fluid, SDL, libGLU_combined, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 , serverOnly ? false }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ] - ++ lib.optionals (!serverOnly) [ mesa glew fmod fluidsynth gtk2 ]; + ++ lib.optionals (!serverOnly) [ libGLU_combined glew fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index cc5d57ab6f9c..9467345db1c2 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, unzip, zlib, SDL, readline, mesa, libX11 }: +, unzip, zlib, SDL, readline, libGLU_combined, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh"; }; - buildInputs = [ unzip zlib SDL readline mesa libX11 ]; + buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ]; configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice"; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 4b8378368a3f..601503dc07ec 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg -, mesa, openal, pkgconfig, sfml, stdenv, zlib +, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 8025cf766f07..01e1847973c7 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, mesa +{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index c18a63f720dd..e2bac5d3884c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre + buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 48696f6b3008..57e76a964376 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }: +{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }: stdenv.mkDerivation rec { name = "dosbox-0.74"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL mesa ]; + buildInputs = [ SDL libGLU_combined ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index a17dd6a775ea..86dfd25d175f 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }: +{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: let revision = "4025"; revisionDate = "2017-07-02"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ SDL SDL_net SDL_sound libpng mesa ]; + buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ]; desktopItem = makeDesktopItem { name = "dosbox"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index b700b22807c4..16cb7af3d600 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: stdenv.mkDerivation rec { name = "emulationstation-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 4d698563469e..eb7964cc017d 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11, +{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; - buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11 + buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11 libXxf86vm libXcursor libXpm ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 8b2409b74c33..6ba5290fa424 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }: +, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 74aa29e84ef8..f5ba2ef218d1 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 SDL nasm zlib libpng mesa ]; + buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 87e619358c8c..7b42e8d60339 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -2,7 +2,7 @@ , p7zip, pkgconfig , libX11, libXv , udev -, mesa, SDL +, libGLU_combined, SDL , libao, openal, libpulseaudio , gtk2, gtksourceview }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include <cmath>' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 1172a89caf32..9101c1587c25 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - mesa + libGLU_combined libcdio libjack2 libsamplerate diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 98bd8bae3e02..65867de61a23 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, libGLU_combined , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk2 GConf libGLU_combined expat zlib ]; installPhase = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 6cec834e985f..6bb91b2213a5 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, libGLU -, makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas +, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk3 gdk_pixbuf libGLU - mesa + libGLU_combined libarchive libao unzip diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 605cb7261a2e..ec7c55171714 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, makeWrapper, python27, retroarch -, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL +, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL , ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis , miniupnpc, sfml, xorg, zlib }: @@ -140,7 +140,7 @@ in description = "Port of Dolphin to libretro"; extraBuildInputs = [ - cmake curl mesa pcre pkgconfig sfml miniupnpc + cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc gettext glib gtk2 hidapi libevdev libudev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); @@ -213,7 +213,7 @@ in }; description = "Port of MAME to libretro"; - extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ]; }).override { postPatch = '' # Prevent the failure during the parallel building of: @@ -241,7 +241,7 @@ in }; description = "Libretro port of Mupen64 Plus, GL only"; - extraBuildInputs = [ mesa libpng ]; + extraBuildInputs = [ libGLU_combined libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -267,7 +267,7 @@ in }; description = "Parallel Mupen64plus rewrite for libretro."; - extraBuildInputs = [ mesa libpng ]; + extraBuildInputs = [ libGLU_combined libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -295,7 +295,7 @@ in sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r"; }; description = "ppsspp libretro port"; - extraBuildInputs = [ mesa ffmpeg ]; + extraBuildInputs = [ libGLU_combined ffmpeg ]; }).override { buildPhase = "cd libretro && make"; }; @@ -332,7 +332,7 @@ in sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m"; }; description = "Reicast libretro port"; - extraBuildInputs = [ mesa ]; + extraBuildInputs = [ libGLU_combined ]; }).override { buildPhase = "make"; }; @@ -345,7 +345,7 @@ in sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy"; }; description = "Libretro port of ScummVM"; - extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; + extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ]; }).override { buildPhase = "cd backends/platform/libretro/build && make"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 5e5ce9edca4b..f30d50ef4d0c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig -, ffmpeg, mesa, freetype, libxml2, python34 +, ffmpeg, libGLU_combined, freetype, libxml2, python34 , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , alsaLib ? null, libv4l ? null , udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + buildInputs = [ ffmpeg libGLU_combined freetype libxml2 coreutils python34 which SDL ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 9f1cbdf39089..66ea5b125757 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -9,7 +9,7 @@ , libpthreadstubs , libXdmcp , libxshmfence -, mesa +, libGLU_combined , openal , pkgconfig , SDL2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ffmpeg gettext gtk2-x11 - mesa + libGLU_combined openal pkgconfig SDL2 diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 0b56cb21dc0d..010c4721dc2d 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined pkgconfig gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = "--enable-fullscreen --enable-gnomeui"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index a09274804440..a147c986674e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.mesa pkgs.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index e13abb6fe2b6..7be911763181 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}: +{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}: stdenv.mkDerivation { name = "wxmupen64plus-0.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; - buildInputs = [ python wxGTK29 SDL libX11 mesa ]; + buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ]; configurePhase = '' tar xf ${mupen64plus.src} diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index fb99421a61ae..e7237fd4454c 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase mesa freeglut openal SDL2 ]; + buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ]; patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index ad80cb13f78c..1ea8d7e68d3c 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined , makeDesktopItem }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ]; prePatch = '' for i in $(cat debian/patches/series); do diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index d7a6cebcc563..c0b86336163d 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -6,7 +6,7 @@ # renderers , enableAGG ? true, agg ? null , enableCairo ? false, cairo ? null -, enableOpenGL ? false, mesa ? null +, enableOpenGL ? false, libGLU_combined ? null # GUI toolkits , enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null @@ -49,7 +49,7 @@ in # renderers assert enableAGG -> available agg; assert enableCairo -> available cairo; -assert enableOpenGL -> available mesa; +assert enableOpenGL -> available libGLU_combined; # GUI toolkits assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; @@ -62,7 +62,7 @@ assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst- # misc assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> available mesa; +assert enableHwAccel -> available libGLU_combined; assert enablePlugins -> all available [ xulrunner npapi_sdk ]; assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; @@ -90,11 +90,11 @@ stdenv.mkDerivation rec { libpng libjpeg giflib pango atk ] ++ optional enableAGG agg ++ optional enableCairo cairo - ++ optional enableOpenGL mesa + ++ optional enableOpenGL libGLU_combined ++ optional enableQt qt4 ++ optional enableFFmpeg ffmpeg_2 ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel mesa + ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4a51facb4aa4..17cf99d8b00c 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined , glee }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut mesa glee + flam3 libgtop boost tinyxml freeglut libGLU_combined glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 7b280d770b38..e8b9346a8727 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index b07c11a23dd3..b337b6cb0e90 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam + [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 2b907bde10ae..6cb8cacbffac 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -246,9 +246,9 @@ if test -z "$libsOnly"; then ( # build and install fgl_glxgears cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ - -I$mesa/include \ + -I$libGLU_combined/include \ -I$out/include \ - -L$mesa/lib -lGL -lGLU -lX11 -lm \ + -L$libGLU_combined/lib -lGL -lGLU -lX11 -lm \ -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c ) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index d9e6ec3cf624..df6fa3555fee 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, kernel ? null, which , xorg, makeWrapper, glibc, patchelf, unzip -, fontconfig, freetype, mesa # for fgl_glxgears +, fontconfig, freetype, libGLU_combined # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE patchelf unzip - mesa + libGLU_combined fontconfig freetype makeWrapper @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE - mesa + libGLU_combined fontconfig freetype stdenv.cc.cc @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { xorg.libX11.out xorg.libXinerama.out xorg.libSM.out xorg.libICE.out ]; - inherit mesa; # only required to build the examples + inherit libGLU_combined; # only required to build the examples enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index bc7b254e19e9..d3d6cfd4c58b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -4,7 +4,7 @@ , systemd , libxkbcommon , libdrm -, mesa +, libGLU_combined , pango , pixman , pkgconfig @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd libxkbcommon libdrm - mesa + libGLU_combined pango pixman pkgconfig diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 6c16803b5090..2fb4fe93cc81 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; src = fetchgit { - url = git://anongit.freedesktop.org/mesa/kmscube; + url = git://anongit.freedesktop.org/libGLU_combined/kmscube; rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index ece08fd5cd48..c552011f3844 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, libXv, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + buildInputs = [ libjpeg_turbo libGLU_combined fltk libX11 libXv ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index ec0508d1a62c..c32624f5885d 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL libGLU_combined_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d0f78f80c3e9..2ffe4eb7f809 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra , help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ]; nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index bdfecb9de735..52f5a0997274 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, cmake, mesa, xorg }: +{stdenv, fetchgit, cmake, libGLU_combined, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ mesa xorg.libX11 ]; + buildInputs = [ libGLU_combined xorg.libX11 ]; configureScript = '' cmake diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 0d31f8f1a6f7..8a75fea33ce8 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, +{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGLU_combined, libdrm, python27, wayland, libudev }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 libGLU_combined libdrm python27 wayland libudev ]; buildPhase = '' diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 5960b8b6f047..b4b881e6c500 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glxinfo-${version}"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2"; sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 2f18857b2a16..e767b7564ecf 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew -, mesa, boost, glm, freetype }: +, libGLU_combined, boost, glm, freetype }: stdenv.mkDerivation rec { name = "logstalgia-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost + buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost glm freetype ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index aaf7b68d177f..c7e8dc966e8d 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , zlib, libpng, libjpeg -, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: +, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: stdenv.mkDerivation rec { name = "maim-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = - [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr + [ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr libXcomposite slop icu ]; doCheck = false; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index a74d83e9a1e2..4c1ff5024331 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, openexr, zlib, imagemagick, mesa, freeglut, fftwFloat +, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv, qt4 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - openexr zlib imagemagick mesa freeglut fftwFloat + openexr zlib imagemagick libGLU_combined freeglut fftwFloat fftw gsl libexif perl opencv qt4 ]; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index bdcbc939a07b..82dd387f536d 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis, qmake4Hook }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; + buildInputs = [ xorgserver libGLU_combined xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 588511638bea..2ec795e78e90 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -1,6 +1,6 @@ { fetchzip , libX11 -, mesa +, libGLU_combined , makeWrapper , stdenv }: @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - mesa + libGLU_combined stdenv.cc.cc libX11 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - mesa + libGLU_combined libX11 ]; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 21786f3f15f5..afe7a81ebac8 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU_combined, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { xorg.libXrender stdenv.cc.cc glibc - mesa + libGLU_combined ]; installPhase = '' diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 3493e7ffa7ba..f5c15775777f 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, mesa, perl, wineStaging +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; - buildInputs = [ wine_custom libX11 mesa curl ]; + buildInputs = [ wine_custom libX11 libGLU_combined curl ]; propagatedbuildInputs = [ curl cabextract ]; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index d1e5a2451a79..ad1c2b64e65d 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}: +, glew, glm, libGLU_combined, libX11, libXext, libXrender, cppcheck, icu}: stdenv.mkDerivation rec { name = "slop-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glew glm mesa libX11 libXext libXrender icu ] + buildInputs = [ glew glm libGLU_combined libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 1bf5a9033b99..38104b8b213d 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,5 +1,5 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg -, glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype +, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig , makeWrapper , makeDesktopItem, python, pythonPackages, lib , libredirect, lsof}: @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ openssl - mesa + libGLU_combined fontconfig freetype libpulseaudio diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 4ebe62ef9a5f..47e6766d21fa 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.mesa.nl/pub/mpage/; + homepage = http://www.libGLU_combined.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } From e94cd63bf50781ab65c7d4387f1abeaf4bd7841e Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 15:38:25 +0200 Subject: [PATCH 05/13] treewide: transition libGL/libGLU for qt Also rename mesaSupported to libGLSupported --- .../libraries/qt-4.x/4.8/default.nix | 6 +++--- .../libraries/qt-5/5.10/default.nix | 4 ++-- .../development/libraries/qt-5/5.6/default.nix | 4 ++-- .../development/libraries/qt-5/5.9/default.nix | 4 ++-- .../libraries/qt-5/modules/qtbase.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8b3fd8c66781..bafe36647359 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -2,7 +2,7 @@ , hostPlatform , libXrender, libXinerama, libXcursor, libXmu, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + openglDriver = if libGLSupported then libGL.driverLink else "/no-such-path"; }) (fetchpatch { name = "fix-medium-font.patch"; @@ -159,7 +159,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ optional mesaSupported mesa_glu + ++ optional libGLSupported libGLU ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index eeff34568332..2ff9a46bc772 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, # options @@ -66,7 +66,7 @@ let qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; patches = patches.qtbase; - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 8793b2bb9f01..b9ed5eddd5cf 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -27,7 +27,7 @@ existing packages here and modify it as necessary. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, # options @@ -74,7 +74,7 @@ let inherit mkDerivation; qtbase = callPackage ../modules/qtbase.nix { - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit developerBuild decryptSslTraffic; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 5afcdaa430e5..e109fe447aa2 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, # options @@ -66,7 +66,7 @@ let qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; patches = patches.qtbase; - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index aa4449504bb9..3a0a7326f762 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -18,8 +18,8 @@ withGtk3 ? false, dconf ? null, gtk3 ? null, # options - mesaSupported ? (!stdenv.isDarwin), - mesa, + libGLSupported ? (!stdenv.isDarwin), + libGL, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -69,7 +69,7 @@ stdenv.mkDerivation { libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm ] - ++ lib.optional mesaSupported mesa + ++ lib.optional libGLSupported libGL ); buildInputs = @@ -142,11 +142,11 @@ stdenv.mkDerivation { # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. else - lib.optionalString mesaSupported + lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ - -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ - -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" '' ); @@ -208,7 +208,7 @@ stdenv.mkDerivation { # 10.10 ] else - lib.optional mesaSupported ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' + lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54666152c87c..6d3bcc3b23fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10390,7 +10390,7 @@ with pkgs; # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) libGL_driver = mesa_drivers; - mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + libGLSupported = lib.elem system lib.platforms.mesaPlatforms; libGLDarwinOr = alternative: if stdenv.isDarwin then callPackage ../development/libraries/mesa-darwin { @@ -10853,7 +10853,7 @@ with pkgs; qoauth = callPackage ../development/libraries/qoauth { }; qt3 = callPackage ../development/libraries/qt-3 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; libpng = libpng12; }; @@ -10861,13 +10861,13 @@ with pkgs; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true - mesa = mesa_noglu; inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; + inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -10892,7 +10892,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -10906,7 +10906,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -10921,7 +10921,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -11172,7 +11172,7 @@ with pkgs; schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; @@ -11196,7 +11196,7 @@ with pkgs; SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; waylandSupport = stdenv.isLinux; @@ -18887,7 +18887,7 @@ with pkgs; racer = callPackage ../games/racer { }; residualvm = callPackage ../games/residualvm { - openglSupport = mesaSupported; + openglSupport = libGLSupported; }; rftg = callPackage ../games/rftg { }; From 13e0038f5d354aa7e6a439200b75306e2cc4aa5a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 15:50:27 +0200 Subject: [PATCH 06/13] perl-packages: libGL/libGLU transition --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4beb076667cc..e8b29224ac42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10714,7 +10714,8 @@ let self = _self // overrides; _self = with self; { sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; + # FIXME: try with libGL + libGLU instead of libGLU_combined + buildInputs = with pkgs; [ libGLU_combined libGLU freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -15935,7 +15936,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx OpenGL pkgs.mesa_glu ]; + propagatedBuildInputs = [ Wx OpenGL pkgs.libGLU ]; doCheck = false; }; From 33daafd4c50af808b1cbaf8c39e41d5f11e4e285 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 15:50:46 +0200 Subject: [PATCH 07/13] python-packages: libGL/libGLU transition --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b53c0f279f2..6d12f1c1eaf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14444,11 +14444,11 @@ in { url = "mirror://pypi/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; - propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ]; + propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ]; patchPhase = '' sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py + sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py ''; meta = { @@ -21583,7 +21583,7 @@ EOF sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; disabled = isPy3k; # Judging from SyntaxError - buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ]; + buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; }; smugpy = callPackage ../development/python-modules/smugpy { }; From 77b23a8e7c3c221cf56cdfe359fa98c23b7ebe00 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 16:09:16 +0200 Subject: [PATCH 08/13] asymptote: direct reference to mesa_noglu.osmesa --- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index c32624f5885d..04863d6ce625 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL libGLU_combined_noglu.osmesa ] + [ freeglut libGLU libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; From 38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 16:11:51 +0200 Subject: [PATCH 09/13] construo: fix build after libGL transition --- pkgs/games/construo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index cfcf057dd1ab..7db641367311 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }: +{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { name = "construo-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xproto ] - ++ stdenv.lib.optional (libGLU_combined != null) mesa + ++ stdenv.lib.optional (libGL != null) libGL ++ stdenv.lib.optional (freeglut != null) freeglut; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3bcc3b23fa..f740c390f04a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18543,12 +18543,13 @@ with pkgs; confd = callPackage ../tools/system/confd { }; construoBase = lowPrio (callPackage ../games/construo { - mesa = null; + libGL = null; freeglut = null; }); construo = construoBase.override { - inherit mesa freeglut; + inherit freeglut; + libGL = libGLU_combined; }; crack_attack = callPackage ../games/crack-attack { }; From ea04aa17207318554f0004010e1cb5f7f13e9f42 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 16:21:43 +0200 Subject: [PATCH 10/13] libdevil: fix build after libGL/libGLU transition --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f740c390f04a..aea7979ceda7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9543,7 +9543,7 @@ with pkgs; libdevil-nox = libdevil.override { libX11 = null; - mesa_noglu = null; + libGL = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; From 42dcaa91d61dc5ad4076c984d914ece9eddfd46a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 16:31:03 +0200 Subject: [PATCH 11/13] libglvnd: refer to driversLink via libGL_driver --- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index ebcbdb23e9fb..7ea1ecdd0522 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGLU_combined_noglu, libX11, libXext, glproto }: +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGL_driver, libX11, libXext, glproto }: # Git version is needed for EGL and GLES handling. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGLU_combined_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGL_driver.driverLink}/share/glvnd/egl_vendor.d\"" ]; outputs = [ "out" "dev" ]; From 25a78f7234ced8840610178a695078b5b08d9e6b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" <avn@avnik.info> Date: Sat, 24 Feb 2018 16:33:33 +0200 Subject: [PATCH 12/13] qt-3: fix build after libGL transition --- pkgs/development/libraries/qt-3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 174be6a8f53a..32841c9b9331 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { -qt-gif -I${xextproto}/include ${if openglSupport then "-dlopen-opengl - -L${libGLU_combined}/lib -I${mesa}/include + -L${libGLU_combined}/lib -I${libGLU_combined}/include -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} From 04c31a5de10a64c52440846f47b22a8e7312081c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com> Date: Mon, 5 Mar 2018 14:53:38 +0100 Subject: [PATCH 13/13] libGL rename: fallout after a week on master and a few nitpicks. --- pkgs/applications/video/avidemux/default.nix | 4 ++-- pkgs/development/libraries/mesa/default.nix | 2 +- pkgs/development/libraries/virglrenderer/default.nix | 4 ++-- pkgs/tools/X11/primus/lib.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix index 62b819c600cc..de2394cd4a14 100644 --- a/pkgs/applications/video/avidemux/default.nix +++ b/pkgs/applications/video/avidemux/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, cmake, pkgconfig, lndir , zlib, gettext, libvdpau, libva, libXv, sqlite , yasm, freetype, fontconfig, fribidi -, makeWrapper, libXext, mesa_glu, qttools, qtbase +, makeWrapper, libXext, libGLU, qttools, qtbase , alsaLib , withX265 ? true, x265 , withX264 ? true, x264 @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ yasm cmake pkgconfig ]; buildInputs = [ 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 withX265 x265 ++ lib.optional withXvid xvidcore diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index fa3336c4cea0..3f873022f7ac 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -14,7 +14,7 @@ }: /** Packaging design: - - The basic mesa ($out) contains headers and libraries (GLU is in mesa_glu now). + - The basic mesa ($out) contains headers and libraries (GLU is in libGLU now). This or the mesa attribute (which also contains GLU) are small (~ 2 MB, mostly headers) and are designed to be the buildInput of other packages. - DRI drivers are compiled into $drivers output, which is much bigger and diff --git a/pkgs/development/libraries/virglrenderer/default.nix b/pkgs/development/libraries/virglrenderer/default.nix index a51348812676..0d9abc0247e2 100644 --- a/pkgs/development/libraries/virglrenderer/default.nix +++ b/pkgs/development/libraries/virglrenderer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, epoxy, libX11 }: +{ stdenv, fetchurl, pkgconfig, libGLU, epoxy, libX11 }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "a549e351e0eb2ad1df471386ddcf85f522e7202808d1616ee9ff894209066e1a"; }; - buildInputs = [ mesa_noglu epoxy libX11 ]; + buildInputs = [ libGLU epoxy libX11 ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/X11/primus/lib.nix b/pkgs/tools/X11/primus/lib.nix index 6aaaf83d9754..d9bebf6055f6 100644 --- a/pkgs/tools/X11/primus/lib.nix +++ b/pkgs/tools/X11/primus/lib.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, fetchpatch -, libX11, mesa_noglu +, libX11, libGL , nvidia_x11 ? null , libglvnd }: let aPackage = - if nvidia_x11 == null then mesa_noglu + if nvidia_x11 == null then libGL else if nvidia_x11.useGLVND then libglvnd else nvidia_x11; @@ -28,12 +28,12 @@ in stdenv.mkDerivation { }) ]; - buildInputs = [ libX11 mesa_noglu ]; + buildInputs = [ libX11 libGL ]; makeFlags = [ "LIBDIR=$(out)/lib" "PRIMUS_libGLa=${aPackage}/lib/libGL.so" - "PRIMUS_libGLd=${mesa_noglu}/lib/libGL.so" - "PRIMUS_LOAD_GLOBAL=${mesa_noglu}/lib/libglapi.so" + "PRIMUS_libGLd=${libGL}/lib/libGL.so" + "PRIMUS_LOAD_GLOBAL=${libGL}/lib/libglapi.so" ]; installPhase = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbe15aca5d81..f09d02034224 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8599,7 +8599,7 @@ with pkgs; # Multi-arch "drivers" which we want to build for i686. driversi686Linux = recurseIntoAttrs { inherit (pkgsi686Linux) - mesa_noglu + mesa_drivers vaapiIntel libvdpau-va-gl vaapiVdpau @@ -12775,7 +12775,7 @@ with pkgs; inherit (buildPackages) pkgconfig xmlto asciidoc flex bison; inherit (darwin) apple_sdk cf-private libobjc; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; - mesa = mesa_noglu; + mesa = libGL; python = python2; # Incompatible with Python 3x udev = if stdenv.isLinux then udev else null; libdrm = if stdenv.isLinux then libdrm else null;