public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wxGTK28, wxGTK29, wxGTK30: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:33:20 +00:00
parent 1b2c28b0ee
commit 5cf90c3b20
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/wxwidgets/2.8/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, libX11, cairo , 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, , compat24 ? false, compat26 ? true, unicode ? true,
}: }:

3
pkgs/development/libraries/wxwidgets/2.9/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto
, gstreamer, gst-plugins-base, GConf, setfile , 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 , compat24 ? false, compat26 ? true, unicode ? true
, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
}: }:

3
pkgs/development/libraries/wxwidgets/3.0/default.nix
View File

@ -1,7 +1,8 @@
{ stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig
, gtk2, gtk3, libXinerama, libSM, libXxf86vm , gtk2, gtk3, libXinerama, libSM, libXxf86vm
, xorgproto, gstreamer, gst-plugins-base, GConf, setfile , 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 , compat24 ? false, compat26 ? true, unicode ? true
, withGtk2 ? true , withGtk2 ? true
, withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk ? null

3
pkgs/top-level/all-packages.nix
View File

@ -13008,21 +13008,18 @@ in
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
inherit (gnome2) GConf; inherit (gnome2) GConf;
withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
}; };
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
inherit (gnome2) GConf; inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
}; };
wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 { wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 {
inherit (gnome2) GConf; inherit (gnome2) GConf;
inherit (darwin.stubs) setfile; inherit (darwin.stubs) setfile;
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
withMesa = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
}; };
wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {}; wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {};