From f0733a07d5a1347eeee1fda81eee336fef50be66 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 28 May 2019 14:52:34 -0400 Subject: [PATCH] treewide: remove libGLSupported from pkgs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This isn’t a package, and we already have mesaPlatforms to handle this logic. --- pkgs/development/libraries/SDL/default.nix | 3 ++- pkgs/development/libraries/SDL2/default.nix | 3 ++- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/qt-3/default.nix | 5 +++-- pkgs/development/libraries/qt-4.x/4.8/default.nix | 3 ++- pkgs/development/libraries/wxwidgets/2.8/default.nix | 5 +++-- pkgs/development/libraries/wxwidgets/2.9/default.nix | 5 +++-- pkgs/development/libraries/wxwidgets/3.0/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 -- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 007cd02957ba..fd3c6b471453 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -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 diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 2909b16d65d8..a2db9c2349d1 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -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 diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 0151bac402cd..e388b3af5f67 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index dc05251478c9..3b3f406485c7 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index d5bd065ab648..34ef7463817d 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -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 diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 1b08bb090b4d..b952e8b12673 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -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, }: diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 18e0cebec859..369d011f9b3c 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -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 }: diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index a89f132b8322..72cc32a0a1c9 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5fccb6c182ec..566c6c1a5d38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;