treewide: transition from mesa_glu to libGLU

This commit is contained in:
Alexander V. Nikolaev 2018-02-24 14:59:47 +02:00
parent 8f2a22935c
commit 1bc1909e5b
42 changed files with 92 additions and 92 deletions

View file

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

View file

@ -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.

View file

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

View file

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

View file

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

View file

@ -1,11 +1,11 @@
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }:
{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }:
let
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

View file

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

View file

@ -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

View file

@ -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' "" \

View file

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

View file

@ -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

View file

@ -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
}:

View file

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

View file

@ -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

View file

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

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

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

View file

@ -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='

View file

@ -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='

View file

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

View file

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

View file

@ -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

View file

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

View file

@ -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/

View file

@ -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

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -48,7 +48,7 @@ let
# Verified games requirements
xlibs.libXmu
xlibs.libxcb
mesa_glu
libGLU
libuuid
libogg
libvorbis

View file

@ -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 = ''

View file

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

View file

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

View file

@ -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

View file

@ -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

View file

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

View file

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

View file

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