mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-27 08:01:14 +00:00
treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
This commit is contained in:
parent
70de27bbb4
commit
f0733a07d5
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, config, libGLSupported, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
|
||||
{ stdenv, config, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported, libGL, libGLU
|
||||
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
|
||||
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
{ stdenv, config, libGLSupported, fetchurl, pkgconfig
|
||||
{ stdenv, config, fetchurl, pkgconfig
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? libGLSupported, libGL
|
||||
, alsaSupport ? stdenv.isLinux && !stdenv.hostPlatform.isAndroid, alsaLib
|
||||
, x11Support ? !stdenv.isCygwin && !stdenv.hostPlatform.isAndroid
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
, x11Support? !stdenv.isDarwin, libXext, libXrender
|
||||
, gobjectSupport ? true, glib
|
||||
, xcbSupport ? x11Support, libxcb, xcbutil # no longer experimental since 1.12
|
||||
, libGLSupported
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, glSupport ? config.cairo.gl or (libGLSupported && stdenv.isLinux && !stdenv.isAarch32 && !stdenv.isMips)
|
||||
, libGL ? null # libGLU_combined is no longer a big dependency
|
||||
, pdfSupport ? true
|
||||
|
|
|
@ -6,8 +6,9 @@
|
|||
, cursorSupport ? true, libXcursor ? null
|
||||
, threadSupport ? true
|
||||
, mysqlSupport ? false, mysql ? null
|
||||
, libGLSupported
|
||||
, openglSupport ? libGLSupported, libGLU_combined ? null, libXmu ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, openglSupport ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU_combined ? null, libXmu ? null
|
||||
, xlibsWrapper, xorgproto, zlib, libjpeg, libpng, which
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, lib, fetchurl, fetchpatch, substituteAll
|
||||
, libXrender, libXinerama, libXcursor, libXv, libXext
|
||||
, libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng
|
||||
, libmng, which, libGLSupported, libGLU, openssl, dbus, cups, pkgconfig
|
||||
, libmng, which, libGLU, openssl, dbus, cups, pkgconfig
|
||||
, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi
|
||||
, buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
|
||||
, buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, flashplayerFix ? false, gdk_pixbuf
|
||||
, gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
|
||||
, gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, gstreamer, gst-plugins-base, GConf, libX11, cairo
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true,
|
||||
}:
|
||||
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
|
||||
, gstreamer, gst-plugins-base, GConf, setfile
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
|
||||
}:
|
||||
|
|
|
@ -1,8 +1,9 @@
|
|||
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
|
||||
, gtk2, gtk3, libXinerama, libSM, libXxf86vm
|
||||
, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
|
||||
, libGLSupported
|
||||
, withMesa ? libGLSupported, libGLU ? null, libGL ? null
|
||||
, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
|
||||
, libGLU ? null, libGL ? null
|
||||
, compat24 ? false, compat26 ? true, unicode ? true
|
||||
, withGtk2 ? true
|
||||
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null
|
||||
|
|
|
@ -12239,8 +12239,6 @@ in
|
|||
# Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need)
|
||||
libGL_driver = mesa_drivers;
|
||||
|
||||
libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
|
||||
|
||||
mesa_noglu = callPackage ../development/libraries/mesa {
|
||||
# 7 is the default, but only on Linux, so keep this for now
|
||||
llvmPackages = llvmPackages_7;
|
||||
|
|
Loading…
Reference in a new issue