treewide: transition from mesa_noglu to libGL
This commit is contained in:
Alexander V. Nikolaev
parent
8da9b485ec
commit
8f2a22935c
50 changed files with 107 additions and 107 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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; [
|
||||
|
|
|
|||
|
|
@ -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; [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ++
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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 [
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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; {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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" ];
|
||||
|
|
|
|||
|
|
@ -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='
|
||||
|
|
|
|||
|
|
@ -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='
|
||||
|
|
|
|||
|
|
@ -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}";
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 + ''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 ];
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
])));
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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 ])
|
||||
;
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue