summary refs log tree commit diff
path: root/pkgs/development/libraries/wxwidgets
diff options
context:
space:
mode:
authorJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:20 +0000
committerJan Malakhovski <oxij@oxij.org>2019-02-03 15:33:20 +0000
commit5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888 (patch)
tree713ecb014888150c0373d34f85d17230e89ef496 /pkgs/development/libraries/wxwidgets
parent1b2c28b0ee3f669d80a3769c23d74a9258ec9252 (diff)
downloadnixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar.gz
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar.bz2
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar.lz
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar.xz
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.tar.zst
nixpkgs-5cf90c3b20803ec49c5bae8a47e1ffb4a7a82888.zip
wxGTK28, wxGTK29, wxGTK30: move defaults to package file
Diffstat (limited to 'pkgs/development/libraries/wxwidgets')
-rw-r--r--pkgs/development/libraries/wxwidgets/2.8/default.nix3
-rw-r--r--pkgs/development/libraries/wxwidgets/2.9/default.nix3
-rw-r--r--pkgs/development/libraries/wxwidgets/3.0/default.nix3
3 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix
index 6d2e25709b5..1b08bb090b4 100644
--- a/pkgs/development/libraries/wxwidgets/2.8/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , gstreamer, gst-plugins-base, GConf, libX11, cairo
-, withMesa ? true, libGLU ? null, libGL ? null
+, libGLSupported
+, withMesa ? libGLSupported, 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 426f5cf92a1..1938b15efbb 100644
--- a/pkgs/development/libraries/wxwidgets/2.9/default.nix
+++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
 , gstreamer, gst-plugins-base, GConf, setfile
-, withMesa ? true, libGLU ? null, libGL ? null
+, libGLSupported
+, withMesa ? libGLSupported, 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 45bf5f779c2..948b261fe45 100644
--- a/pkgs/development/libraries/wxwidgets/3.0/default.nix
+++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
 , gtk2, gtk3, libXinerama, libSM, libXxf86vm
 , xorgproto, gstreamer, gst-plugins-base, GConf, setfile
-, withMesa ? true, libGLU ? null, libGL ? null
+, libGLSupported
+, withMesa ? libGLSupported, libGLU ? null, libGL ? null
 , compat24 ? false, compat26 ? true, unicode ? true
 , withGtk2 ? true
 , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null