git.iko.soy/typeable/nixpkgs
on master help sign in
wxGTK3: make gtk2 and gtk3 specific variants
commit7439aad737c00915ecc09703ba65721d0513f563 authorPeter Hoeg <peter@hoeg.com> dateMon 15 Jun 2020, 11:01 (6 years ago) parent0a14605
3 files changed+34−13
pkgs/development/libraries/wxwidgets/3.0/default.nix+8−6 pkgs/development/libraries/wxwidgets/3.1/default.nix+7−5 pkgs/top-level/all-packages.nix+19−2
pkgs/development/libraries/wxwidgets/3.0/default.nix+8−6
@@ -1,8 +1,9 @@
11{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
2−, gtk2, gtk3, libXinerama, libSM, libXxf86vm
3−, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
2+, libXinerama, libSM, libXxf86vm
3+, gtk2, GConf ? null, gtk3
4+, xorgproto, gstreamer, gst-plugins-base, setfile
45, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
5−, withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
6+, withMesa ? libGLSupported
67, libGLU ? null, libGL ? null
78, compat24 ? false, compat26 ? true, unicode ? true
89, withGtk2 ? true
@@ -28,9 +29,10 @@ stdenv.mkDerivation rec {
2829 sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1";
2930 };
3031
31− buildInputs =
32− [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
33− gst-plugins-base GConf ]
32+ buildInputs = [
33+ libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
34+ ] ++ optionals withGtk2 [ gtk2 GConf ]
35+ ++ optional (!withGtk2) gtk3
3436 ++ optional withMesa libGLU
3537 ++ optional withWebKit webkitgtk
3638 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
pkgs/development/libraries/wxwidgets/3.1/default.nix+7−5
@@ -1,6 +1,7 @@
11{ stdenv, fetchFromGitHub, fetchurl, pkgconfig
2−, gtk2, gtk3, libXinerama, libSM, libXxf86vm
3−, xorgproto, gstreamer, gst-plugins-base, GConf, setfile
2+, libXinerama, libSM, libXxf86vm
3+, gtk2, GConf ? null, gtk3
4+, xorgproto, gstreamer, gst-plugins-base, setfile
45, libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
56, withMesa ? libGLSupported, libGLU ? null, libGL ? null
67, compat28 ? false, compat30 ? true, unicode ? true
@@ -27,9 +28,10 @@ stdenv.mkDerivation rec {
2728 sha256 = "0gfdhb7xq5vzasm7s1di39nchv42zsp0dmn4v6knzb7mgsb107wb";
2829 };
2930
30− buildInputs =
31− [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xorgproto gstreamer
32− gst-plugins-base GConf ]
31+ buildInputs = [
32+ libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base
33+ ] ++ optionals withGtk2 [ gtk2 GConf ]
34+ ++ optional (!withGtk2) gtk3
3335 ++ optional withMesa libGLU
3436 ++ optional withWebKit webkitgtk
3537 ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
pkgs/top-level/all-packages.nix+19−2
@@ -15139,6 +15139,9 @@ in
1513915139
1514015140 wxGTK = wxGTK28;
1514115141
15142+ wxGTK30 = wxGTK30-gtk2;
15143+ wxGTK31 = wxGTK31-gtk2;
15144+
1514215145 wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 {
1514315146 inherit (gnome2) GConf;
1514415147 };
@@ -15149,18 +15152,32 @@ in
1514915152 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
1515015153 };
1515115154
15152− wxGTK30 = callPackage ../development/libraries/wxwidgets/3.0 {
15155+ wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
15156+ withGtk2 = true;
1515315157 inherit (gnome2) GConf;
1515415158 inherit (darwin.stubs) setfile;
1515515159 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
1515615160 };
1515715161
15158− wxGTK31 = callPackage ../development/libraries/wxwidgets/3.1 {
15162+ wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
15163+ withGtk2 = false;
15164+ inherit (darwin.stubs) setfile;
15165+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
15166+ };
15167+
15168+ wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {
15169+ withGtk2 = true;
1515915170 inherit (gnome2) GConf;
1516015171 inherit (darwin.stubs) setfile;
1516115172 inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
1516215173 };
1516315174
15175+ wxGTK31-gtk3 = callPackage ../development/libraries/wxwidgets/3.1 {
15176+ withGtk2 = false;
15177+ inherit (darwin.stubs) setfile;
15178+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
15179+ };
15180+
1516415181 wxmac = callPackage ../development/libraries/wxwidgets/3.0/mac.nix {
1516515182 inherit (darwin.apple_sdk.frameworks) AGL Cocoa Kernel;
1516615183 inherit (darwin.stubs) setfile rez derez;