diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-05-28 14:52:34 -0400 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-06-17 11:49:22 -0400 |
| commit | f0733a07d5a1347eeee1fda81eee336fef50be66 (patch) | |
| tree | 8277fb390d57217848dfc6486b3370b1917fa888 /pkgs/development/libraries/wxwidgets | |
| parent | 70de27bbb4758038e5b87f725d964eefda4898e1 (diff) | |
| download | nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar.gz nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar.bz2 nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar.lz nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar.xz nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.tar.zst nixpkgs-f0733a07d5a1347eeee1fda81eee336fef50be66.zip | |
treewide: remove libGLSupported from pkgs
This isn’t a package, and we already have mesaPlatforms to handle this logic.
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/2.8/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/2.9/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/libraries/wxwidgets/3.0/default.nix | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 1b08bb090b4..b952e8b1267 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 18e0cebec85..369d011f9b3 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 a89f132b832..72cc32a0a1c 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 |