From 0acec7e984ff38b7a296a459ba4b539a3b719c1b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:12:44 +0200 Subject: treewide: transition mesa to libGLU_combined --- pkgs/development/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 +++--- 9 files changed, 20 insertions(+), 20 deletions(-) (limited to 'pkgs/development/interpreters') 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 = '' -- cgit 1.4.1