lol

treewide: transition from mesa_glu to libGLU

+92 -92
+1 -1
pkgs/applications/audio/fmit/default.nix
··· 1 - { stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake 1 + { stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake 2 2 , alsaSupport ? true, alsaLib ? null 3 3 , jackSupport ? false, libjack2 ? null 4 4 , portaudioSupport ? false, portaudio ? null }:
+2 -2
pkgs/applications/audio/x42-plugins/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig 2 2 , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 3 - , mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: 3 + , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 version = "20170428"; ··· 12 12 }; 13 13 14 14 nativeBuildInputs = [ pkgconfig ]; 15 - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; 15 + buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; 16 16 17 17 # Don't remove this. The default fails with 'do not know how to unpack source archive' 18 18 # every now and then on Hydra. No idea why.
+2 -2
pkgs/applications/graphics/meshlab/default.nix
··· 1 - { stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }: 1 + { stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: 2 2 3 3 let 4 4 meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; ··· 53 53 ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver 54 54 ''; 55 55 56 - buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ]; 56 + buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; 57 57 58 58 meta = { 59 59 description = "A system for processing and editing 3D triangular meshes.";
+2 -2
pkgs/applications/graphics/rapcad/default.nix
··· 1 1 { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline 2 - , qtbase, qmake, mesa_glu 2 + , qtbase, qmake, libGLU 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 22 22 ]; 23 23 24 24 nativeBuildInputs = [ qmake ]; 25 - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; 25 + buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; 26 26 27 27 meta = with stdenv.lib; { 28 28 license = licenses.gpl3;
+2 -2
pkgs/applications/graphics/solvespace/default.nix
··· 1 1 { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype 2 - , json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre 2 + , json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xlibs, pcre 3 3 , wrapGAppsHook 4 4 }: 5 5 stdenv.mkDerivation rec { ··· 17 17 ]; 18 18 buildInputs = [ 19 19 zlib libpng cairo freetype 20 - json_c fontconfig gtkmm3 pangomm glew mesa_glu 20 + json_c fontconfig gtkmm3 pangomm glew libGLU 21 21 xlibs.libpthreadstubs xlibs.libXdmcp pcre 22 22 ]; 23 23 enableParallelBuilding = true;
+2 -2
pkgs/applications/misc/houdini/runtime.nix
··· 1 - { stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }: 1 + { stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: 2 2 3 3 let 4 4 ld_library_path = builtins.concatStringsSep ":" [ 5 5 "${stdenv.cc.cc.lib}/lib64" 6 6 "/run/opengl-driver/lib" 7 7 (stdenv.lib.makeLibraryPath [ 8 - mesa_glu 8 + libGLU 9 9 xorg.libXmu 10 10 xorg.libXi 11 11 xorg.libXext
+3 -3
pkgs/applications/misc/mupdf/default.nix
··· 2 2 , jbig2dec, libjpeg , darwin 3 3 , enableX11 ? true, libX11, libXext, libXi, libXrandr 4 4 , enableCurl ? true, curl, openssl 5 - , enableGL ? true, freeglut, mesa_glu 5 + , enableGL ? true, freeglut, libGLU 6 6 }: 7 7 8 8 let ··· 53 53 54 54 makeFlags = [ "prefix=$(out)" ]; 55 55 nativeBuildInputs = [ pkgconfig ]; 56 - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ] 56 + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] 57 57 ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] 58 58 ++ lib.optionals enableCurl [ curl openssl ] 59 59 ++ lib.optionals enableGL ( 60 60 if stdenv.isDarwin then 61 61 with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] 62 62 else 63 - [ freeglut mesa_glu ]) 63 + [ freeglut libGLU ]) 64 64 ; 65 65 outputs = [ "bin" "dev" "out" "man" "doc" ]; 66 66
+2 -2
pkgs/applications/misc/slic3r-prusa3d/default.nix
··· 1 1 { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, 2 - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu, 2 + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, 3 3 glew, eigen }: 4 4 let 5 5 AlienWxWidgets = perlPackages.buildPerlPackage rec { ··· 27 27 url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; 28 28 sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; 29 29 }; 30 - propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; 30 + propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; 31 31 doCheck = false; 32 32 }; 33 33 in
+2 -2
pkgs/applications/science/chemistry/molden/default.nix
··· 1 - { stdenv, fetchurl, which, gfortran, mesa_glu, xorg } : 1 + { stdenv, fetchurl, which, gfortran, libGLU, xorg } : 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "5.7"; ··· 10 10 }; 11 11 12 12 nativeBuildInputs = [ which ]; 13 - buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ]; 13 + buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; 14 14 15 15 postPatch = '' 16 16 substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \
+2 -2
pkgs/applications/science/math/gmsh/default.nix
··· 1 1 { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg 2 - , zlib, mesa, mesa_glu, xorg }: 2 + , zlib, mesa, libGLU, xorg }: 3 3 4 4 let version = "3.0.5"; in 5 5 ··· 16 16 patches = [ ./CMakeLists.txt.patch ]; 17 17 18 18 buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa 19 - mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext 19 + libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext 20 20 xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE 21 21 ]; 22 22
+2 -2
pkgs/applications/video/lightworks/default.nix
··· 1 1 { stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv 2 - , gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu 2 + , gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU 3 3 , nvidia_cg_toolkit, zlib, openssl, portaudio 4 4 }: 5 5 let ··· 11 11 libjpeg_original 12 12 glib 13 13 gnome2.pango 14 - mesa_glu 14 + libGLU 15 15 nvidia_cg_toolkit 16 16 zlib 17 17 openssl
+1 -1
pkgs/desktops/enlightenment/enlightenment.nix
··· 1 1 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, 2 2 xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, 3 - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_glu, 3 + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, 4 4 xkeyboard_config, pcre 5 5 }: 6 6
+2 -2
pkgs/desktops/plasma-5/kinfocenter.nix
··· 3 3 extra-cmake-modules, kdoctools, 4 4 kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, 5 5 kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, 6 - kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid 6 + kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid 7 7 }: 8 8 9 9 mkDerivation { ··· 12 12 buildInputs = [ 13 13 kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons 14 14 kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice 15 - kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid 15 + kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid 16 16 ]; 17 17 }
+4 -4
pkgs/development/compilers/factor-lang/default.nix
··· 1 1 { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, 2 2 rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, 3 3 libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, 4 - mesa_glu, libXmu, libXt, libICE, libSM }: 4 + libGLU, libXmu, libXt, libICE, libSM }: 5 5 6 6 stdenv.mkDerivation rec { 7 7 name = "factor-lang-${version}"; ··· 24 24 nativeBuildInputs = [ pkgconfig ]; 25 25 buildInputs = [ git rlwrap curl perl makeWrapper 26 26 libX11 pango cairo gtk2 gdk_pixbuf gtkglext 27 - mesa_glu libXmu libXt libICE libSM ]; 27 + libGLU libXmu libXt libICE libSM ]; 28 28 29 29 buildPhase = '' 30 30 make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} ··· 51 51 # to be a generic solution here. 52 52 find $(echo ${stdenv.lib.makeLibraryPath [ 53 53 glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext 54 - mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst 54 + libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst 55 55 56 56 (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; 57 57 for l in $(<$TMPDIR/so.lst); ··· 72 72 wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ 73 73 "${stdenv.lib.makeLibraryPath [ glib 74 74 libX11 pango cairo gtk2 gdk_pixbuf gtkglext 75 - mesa_glu libXmu libXt libICE libSM ]}" 75 + libGLU libXmu libXt libICE libSM ]}" 76 76 77 77 sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor 78 78 mv $out/bin/.factor-wrapped $out/lib/factor/factor
+2 -2
pkgs/development/libraries/SDL/default.nix
··· 1 1 { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv 2 - , openglSupport ? false, libGL, mesa_glu 2 + , openglSupport ? false, libGL, libGLU 3 3 , alsaSupport ? true, alsaLib 4 4 , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr 5 5 , pulseaudioSupport ? true, libpulseaudio ··· 33 33 optionals x11Support [ libXext libICE libXrandr ] ++ 34 34 optional alsaSupport alsaLib ++ 35 35 optional stdenv.isLinux libcap ++ 36 - optionals openglSupport [ libGL mesa_glu ] ++ 36 + optionals openglSupport [ libGL libGLU ] ++ 37 37 optional pulseaudioSupport libpulseaudio ++ 38 38 optional stdenv.isDarwin Cocoa; 39 39
+3 -3
pkgs/development/libraries/freeglut/default.nix
··· 1 - { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }: 1 + { stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: 2 2 3 3 let version = "3.0.0"; 4 4 in stdenv.mkDerivation { ··· 11 11 12 12 outputs = [ "out" "dev" ]; 13 13 14 - buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ]; 14 + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; 15 15 16 16 cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ 17 17 "-DOPENGL_INCLUDE_DIR=${libGL}/include" 18 18 "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" 19 - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" 19 + "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" 20 20 "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" 21 21 "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" 22 22 ];
+2 -2
pkgs/development/libraries/glew/1.10.nix
··· 1 - { stdenv, fetchurl, mesa_glu, x11, libXmu, libXi 1 + { stdenv, fetchurl, libGLU, x11, libXmu, libXi 2 2 , buildPlatform, hostPlatform 3 3 , AGL ? null 4 4 }: ··· 14 14 }; 15 15 16 16 buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; 17 - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 17 + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h 18 18 19 19 patchPhase = '' 20 20 sed -i 's|lib64|lib|' config/Makefile.linux
+2 -2
pkgs/development/libraries/glew/default.nix
··· 1 - { stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi 1 + { stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi 2 2 , buildPlatform, hostPlatform 3 3 }: 4 4 ··· 15 15 outputs = [ "bin" "out" "dev" "doc" ]; 16 16 17 17 buildInputs = [ xlibsWrapper libXmu libXi ]; 18 - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h 18 + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h 19 19 20 20 patchPhase = '' 21 21 sed -i 's|lib64|lib|' config/Makefile.linux
+2 -2
pkgs/development/libraries/glfw/2.x.nix
··· 1 - { stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: 1 + { stdenv, fetchurl, libGLU, libGL, libX11, libXext }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "glfw-2.7.9"; ··· 8 8 sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; 9 9 }; 10 10 11 - buildInputs = [ mesa_glu libGL libX11 libXext ]; 11 + buildInputs = [ libGLU libGL libX11 libXext ]; 12 12 13 13 buildPhase = '' 14 14 make x11
+2 -2
pkgs/development/libraries/libvdpau-va-gl/default.nix
··· 1 1 { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp 2 - , libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }: 2 + , libXext, libvdpau, glib, libva, ffmpeg, libGLU }: 3 3 4 4 stdenv.mkDerivation rec { 5 5 name = "libvdpau-va-gl-${version}"; ··· 13 13 }; 14 14 15 15 nativeBuildInputs = [ cmake pkgconfig ]; 16 - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; 16 + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; 17 17 18 18 meta = with stdenv.lib; { 19 19 homepage = https://github.com/i-rinat/libvdpau-va-gl;
+2 -2
pkgs/development/libraries/opensubdiv/default.nix
··· 1 - { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu 1 + { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU 2 2 , libGL, glew, ocl-icd, python3 3 3 , cudaSupport ? false, cudatoolkit 4 4 }: ··· 17 17 outputs = [ "out" "dev" ]; 18 18 19 19 buildInputs = 20 - [ cmake pkgconfig mesa_glu libGL ocl-icd python3 20 + [ cmake pkgconfig libGLU libGL ocl-icd python3 21 21 # FIXME: these are not actually needed, but the configure script wants them. 22 22 glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor 23 23 xorg.libXinerama xorg.libXi
+4 -4
pkgs/development/libraries/wxwidgets/2.8/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto 2 2 , gstreamer, gst-plugins-base, GConf, libX11, cairo 3 - , withMesa ? true, mesa_glu ? null, libGL ? null 3 + , withMesa ? true, libGLU ? null, libGL ? null 4 4 , compat24 ? false, compat26 ? true, unicode ? true, 5 5 }: 6 6 7 - assert withMesa -> mesa_glu != null && libGL != null; 7 + assert withMesa -> libGLU != null && libGL != null; 8 8 9 9 with stdenv.lib; 10 10 ··· 18 18 }; 19 19 20 20 buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] 21 - ++ optional withMesa mesa_glu; 21 + ++ optional withMesa libGLU; 22 22 23 23 nativeBuildInputs = [ pkgconfig ]; 24 24 ··· 39 39 "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; 40 40 SEARCH_LIB = 41 41 "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " 42 - + optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib "; 42 + + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; 43 43 44 44 # Work around a bug in configure. 45 45 NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ];
+4 -4
pkgs/development/libraries/wxwidgets/2.9/default.nix
··· 1 1 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto 2 2 , gstreamer, gst-plugins-base, GConf, setfile 3 - , withMesa ? true, mesa_glu ? null, libGL ? null 3 + , withMesa ? true, libGLU ? null, libGL ? null 4 4 , compat24 ? false, compat26 ? true, unicode ? true 5 5 , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null 6 6 }: 7 7 8 - assert withMesa -> mesa_glu != null && libGL != null; 8 + assert withMesa -> libGLU != null && libGL != null; 9 9 10 10 with stdenv.lib; 11 11 ··· 31 31 buildInputs = 32 32 [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer 33 33 gst-plugins-base GConf ] 34 - ++ optional withMesa mesa_glu 34 + ++ optional withMesa libGLU 35 35 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; 36 36 37 37 nativeBuildInputs = [ pkgconfig ]; ··· 48 48 # allow building on 64-bit 49 49 [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; 50 50 51 - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; 51 + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; 52 52 53 53 preConfigure = " 54 54 substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+4 -4
pkgs/development/libraries/wxwidgets/3.0/default.nix
··· 1 1 { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig 2 2 , gtk2, gtk3, libXinerama, libSM, libXxf86vm 3 3 , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile 4 - , withMesa ? true, mesa_glu ? null, libGL ? null 4 + , withMesa ? true, libGLU ? null, libGL ? null 5 5 , compat24 ? false, compat26 ? true, unicode ? true 6 6 , withGtk2 ? true 7 7 , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null ··· 9 9 }: 10 10 11 11 12 - assert withMesa -> mesa_glu != null && libGL != null; 12 + assert withMesa -> libGLU != null && libGL != null; 13 13 assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; 14 14 15 15 with stdenv.lib; ··· 30 30 buildInputs = 31 31 [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer 32 32 gst-plugins-base GConf ] 33 - ++ optional withMesa mesa_glu 33 + ++ optional withMesa libGLU 34 34 ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) 35 35 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; 36 36 ··· 62 62 ++ optionals withWebKit 63 63 ["--enable-webview" "--enable-webview-webkit"]; 64 64 65 - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; 65 + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; 66 66 67 67 preConfigure = " 68 68 substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE='
+2 -2
pkgs/development/tools/glslviewer/default.nix
··· 1 1 { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage 2 2 , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi 3 - , libX11, mesa_glu, Cocoa 3 + , libX11, libGLU, Cocoa 4 4 }: 5 5 6 6 stdenv.mkDerivation rec { ··· 27 27 28 28 nativeBuildInputs = [ pkgconfig ]; 29 29 buildInputs = [ 30 - glfw mesa_glu glfw libXrandr libXdamage 30 + glfw libGLU glfw libXrandr libXdamage 31 31 libXext libXrender libXinerama libXcursor libXxf86vm 32 32 libXi libX11 33 33 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa;
+2 -2
pkgs/development/tools/godot/default.nix
··· 1 1 { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor 2 2 , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib 3 - , libpulseaudio, mesa_glu, zlib }: 3 + , libpulseaudio, libGLU, zlib }: 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "godot-${version}"; ··· 16 16 nativeBuildInputs = [ pkgconfig ]; 17 17 buildInputs = [ 18 18 gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender 19 - freetype openssl alsaLib libpulseaudio mesa_glu zlib 19 + freetype openssl alsaLib libpulseaudio libGLU zlib 20 20 ]; 21 21 22 22 patches = [ ./pkg_config_additions.patch ];
+2 -2
pkgs/development/tools/unity3d/default.nix
··· 1 1 { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt 2 - , gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev 2 + , gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev 3 3 , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango 4 4 , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit 5 5 , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi ··· 9 9 10 10 let 11 11 libPath64 = lib.makeLibraryPath [ 12 - gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr 12 + gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr 13 13 alsaLib GConf cups libcap fontconfig freetype pango 14 14 cairo dbus expat zlib libpng12 udev 15 15 libX11 libXcursor libXdamage libXfixes libXrender libXi
+2 -2
pkgs/development/tools/vogl/default.nix
··· 3 3 , qtbase, qtx11extras 4 4 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 5 5 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf 6 - , freeglut, mesa_glu 6 + , freeglut, libGLU 7 7 , fetchpatch 8 8 }: 9 9 ··· 33 33 qtbase qtx11extras 34 34 libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 35 35 SDL2 SDL2_gfx SDL2_image SDL2_ttf 36 - freeglut mesa_glu 36 + freeglut libGLU 37 37 ]; 38 38 39 39 dontUseCmakeBuildDir = true;
+2 -2
pkgs/games/amoeba/default.nix
··· 1 - { stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }: 1 + { stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 name = "amoeba-${version}-${debver}"; ··· 27 27 ''; 28 28 29 29 nativeBuildInputs = [ pkgconfig ]; 30 - buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ]; 30 + buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ]; 31 31 32 32 installPhase = '' 33 33 mkdir -p $out/bin $out/share/man/man1/
+2 -2
pkgs/games/mar1d/default.nix
··· 1 1 { stdenv 2 2 , fetchFromGitHub 3 3 , cmake 4 - , mesa_glu 4 + , libGLU 5 5 , x11 6 6 , xorg 7 7 , xinput_calibrator ··· 41 41 doxygen 42 42 libao 43 43 libpthreadstubs 44 - mesa_glu 44 + libGLU 45 45 x11 46 46 xinput_calibrator 47 47 xorg.libXrandr
+3 -3
pkgs/games/megaglest/default.nix
··· 1 1 { stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc 2 2 , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng 3 - , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib 3 + , fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib 4 4 , fetchFromGitHub 5 5 }: 6 6 let ··· 9 9 name = "megaglest-lib-env"; 10 10 paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext 11 11 xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype 12 - stdenv.cc.cc glew mesa_glu wxGTK ]; 12 + stdenv.cc.cc glew libGLU wxGTK ]; 13 13 }; 14 14 path-env = buildEnv { 15 15 name = "megaglest-path-env"; ··· 29 29 30 30 nativeBuildInputs = [ pkgconfig ]; 31 31 buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK 32 - glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; 32 + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; 33 33 34 34 configurePhase = '' 35 35 cmake -DCMAKE_INSTALL_PREFIX=$out \
+2 -2
pkgs/games/openrct2/default.nix
··· 1 1 { stdenv, fetchurl, fetchFromGitHub, 2 2 SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, 3 - libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib 3 + libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib 4 4 }: 5 5 6 6 let ··· 37 37 libpng 38 38 libpthreadstubs 39 39 libzip 40 - mesa_glu 40 + libGLU 41 41 openssl 42 42 pkgconfig 43 43 speexdsp
+2 -2
pkgs/games/scrolls/default.nix
··· 1 1 { stdenv, fetchurl, gcc 2 - , mesa_glu, libX11, libXext, libXcursor, libpulseaudio 2 + , libGLU, libX11, libXext, libXcursor, libpulseaudio 3 3 }: 4 4 stdenv.mkDerivation { 5 5 name = "scrolls-2015-10-13"; ··· 21 21 22 22 libPath = stdenv.lib.makeLibraryPath [ 23 23 gcc 24 - mesa_glu 24 + libGLU 25 25 libX11 26 26 libXext 27 27 libXcursor
+1 -1
pkgs/games/steam/runtime-wrapped.nix
··· 48 48 # Verified games requirements 49 49 xlibs.libXmu 50 50 xlibs.libxcb 51 - mesa_glu 51 + libGLU 52 52 libuuid 53 53 libogg 54 54 libvorbis
+2 -2
pkgs/games/teeworlds/default.nix
··· 1 1 { fetchurl, stdenv, makeWrapper, python, alsaLib 2 - , libX11, mesa_glu, SDL, lua5, zlib, bam, freetype 2 + , libX11, libGLU, SDL, lua5, zlib, bam, freetype 3 3 }: 4 4 5 5 stdenv.mkDerivation rec { ··· 14 14 postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; 15 15 16 16 buildInputs = [ 17 - python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype 17 + python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype 18 18 ]; 19 19 20 20 buildPhase = ''
+2 -2
pkgs/games/tome4/default.nix
··· 1 - {stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: 1 + {stdenv, fetchurl, openal, libpng, libvorbis, libGLU, premake4, SDL2, SDL2_image, SDL2_ttf }: 2 2 3 3 stdenv.mkDerivation rec { 4 4 version = "1.4.9"; ··· 9 9 }; 10 10 nativeBuildInputs = [ premake4 ]; 11 11 buildInputs = [ 12 - mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image 12 + libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image 13 13 ]; 14 14 NIX_CFLAGS_COMPILE = [ 15 15 "-I${SDL2_image}/include/SDL2"
+2 -2
pkgs/games/torcs/default.nix
··· 1 - { fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, 1 + { fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, 2 2 libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, 3 3 libpng, zlib, bash, makeWrapper }: 4 4 ··· 29 29 sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in 30 30 ''; 31 31 32 - buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto 32 + buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xproto 33 33 libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; 34 34 35 35 installTargets = "install datainstall";
+2 -2
pkgs/misc/emulators/desmume/default.nix
··· 5 5 , agg, alsaLib, soundtouch, openal 6 6 , desktop_file_utils 7 7 , gtk2, gtkglext, libglade, pangox_compat 8 - , mesa_glu, libpcap, SDL, zziplib }: 8 + , libGLU, libpcap, SDL, zziplib }: 9 9 10 10 with stdenv.lib; 11 11 stdenv.mkDerivation rec { ··· 29 29 buildInputs = 30 30 [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch 31 31 openal desktop_file_utils gtk2 gtkglext libglade pangox_compat 32 - mesa_glu libpcap SDL zziplib ]; 32 + libGLU libpcap SDL zziplib ]; 33 33 34 34 configureFlags = [ 35 35 "--disable-glade" # Failing on compile step
+2 -2
pkgs/misc/emulators/nestopia/default.nix
··· 1 - { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu 1 + { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, libGLU 2 2 , makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas 3 3 , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook 4 4 }: ··· 25 25 epoxy 26 26 gtk3 27 27 gdk_pixbuf 28 - mesa_glu 28 + libGLU 29 29 mesa 30 30 libarchive 31 31 libao
+2 -2
pkgs/os-specific/linux/v4l-utils/default.nix
··· 1 1 { stdenv, lib, fetchurl, pkgconfig, perl 2 2 , libjpeg, udev 3 3 , withUtils ? true 4 - , withGUI ? true, alsaLib, libX11, qtbase, mesa_glu 4 + , withGUI ? true, alsaLib, libX11, qtbase, libGLU 5 5 }: 6 6 7 7 # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) ··· 31 31 32 32 nativeBuildInputs = [ pkgconfig perl ]; 33 33 34 - buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; 34 + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ]; 35 35 36 36 propagatedBuildInputs = [ libjpeg ]; 37 37
+2 -2
pkgs/tools/admin/tigervnc/default.nix
··· 3 3 , libjpeg_turbo, pixman, fltk 4 4 , fontDirectories 5 5 , cmake, gettext, libtool 6 - , glproto, mesa_glu 6 + , glproto, libGLU 7 7 , gnutls, pam, nettle 8 8 , xterm, openssh }: 9 9 ··· 84 84 fontsproto videoproto scrnsaverproto resourceproto presentproto 85 85 utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft 86 86 libxkbfile libXfont2 libpciaccess xineramaproto 87 - glproto mesa_glu 87 + glproto libGLU 88 88 ] ++ xorgserver.buildInputs; 89 89 90 90 nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ]
+2 -2
pkgs/tools/graphics/asymptote/default.nix
··· 1 1 {stdenv, fetchurl 2 2 , freeglut, ghostscriptX, imagemagick, fftw 3 - , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv 3 + , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv 4 4 , python, zlib, perl, texLive, texinfo, xz 5 5 , darwin 6 6 }: ··· 20 20 boehmgc ncurses readline gsl libsigsegv 21 21 python zlib perl texLive texinfo xz ] 22 22 ++ stdenv.lib.optionals stdenv.isLinux 23 - [ freeglut mesa_glu libGL mesa_noglu.osmesa ] 23 + [ freeglut libGLU libGL mesa_noglu.osmesa ] 24 24 ++ stdenv.lib.optionals stdenv.isDarwin 25 25 (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) 26 26 ;