git.iko.soy/typeable/nixpkgs
on master help sign in
wxwidgets: remove darwin from inputs
commitb7304edb3f9ef82474796438599471e375b40f2a authorAndersonTorres <torres.anderson.85@protonmail.com> dateThu 24 Feb 2022, 13:08 (5 years ago) parent211ec20
5 files changed+25−15
compare with master
unifiedsplit
pkgs/development/libraries/wxwidgets/2.8/default.nix+1−1 pkgs/development/libraries/wxwidgets/2.9/default.nix+8−7 pkgs/development/libraries/wxwidgets/3.0/default.nix+8−5 pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch → pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patch pkgs/top-level/all-packages.nix+8−2
pkgs/development/libraries/wxwidgets/2.8/default.nix+1−1
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
106106 database support, HTML viewing and printing, and much more.
107107 '';
108108 license = licenses.wxWindows;
109− maintainers = with maintainers; [ AndersonTorres ];
109+ maintainers = with maintainers; [ ];
110110 platforms = platforms.linux;
111111 };
112112
pkgs/development/libraries/wxwidgets/2.9/default.nix+8−7
@@ -14,14 +14,15 @@
1414, compat26 ? true
1515, unicode ? true
1616, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
17−, darwin
17+, AGL
18+, Carbon
19+, Cocoa
20+, Kernel
21+, QuickTime
22+, setfile
1823}:
1924
2025assert withMesa -> libGLU != null && libGL != null;
21−let
22− inherit (darwin.stubs) setfile;
23− inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
24−in
2526stdenv.mkDerivation rec {
2627 pname = "wxGTK";
2728 version = "2.9.5";
@@ -35,7 +36,7 @@ stdenv.mkDerivation rec {
3536
3637 patches = [
3738 # https://github.com/wxWidgets/wxWidgets/issues/17942
38− ../0001-fix-assertion-using-hide-in-destroy.patch
39+ ../patches/0001-fix-assertion-using-hide-in-destroy.patch
3940 ];
4041
4142 nativeBuildInputs = [
@@ -115,7 +116,7 @@ stdenv.mkDerivation rec {
115116 database support, HTML viewing and printing, and much more.
116117 '';
117118 license = licenses.wxWindows;
118− maintainers = with maintainers; [ AndersonTorres ];
119+ maintainers = with maintainers; [ ];
119120 platforms = platforms.darwin ++ platforms.linux;
120121 badPlatforms = [ "x86_64-darwin" ];
121122 };
pkgs/development/libraries/wxwidgets/3.0/default.nix+8−5
@@ -17,14 +17,17 @@
1717, unicode ? true
1818, withGtk2 ? true
1919, withWebKit ? false, webkitgtk
20−, darwin
20+, AGL
21+, Carbon
22+, Cocoa
23+, Kernel
24+, QTKit
25+, setfile
2126}:
2227
2328assert withGtk2 -> (!withWebKit);
2429
2530let
26− inherit (darwin.stubs) setfile;
27− inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
2831 inherit (gst_all_1) gstreamer gst-plugins-base;
2932 gtk = if withGtk2 then gtk2 else gtk3;
3033in
@@ -66,7 +69,7 @@ stdenv.mkDerivation rec {
6669
6770 patches = [
6871 # https://github.com/wxWidgets/wxWidgets/issues/17942
69− ../0001-fix-assertion-using-hide-in-destroy.patch
72+ ../patches/0001-fix-assertion-using-hide-in-destroy.patch
7073 ];
7174
7275 configureFlags = [
@@ -126,7 +129,7 @@ stdenv.mkDerivation rec {
126129 database support, HTML viewing and printing, and much more.
127130 '';
128131 license = licenses.wxWindows;
129− maintainers = with maintainers; [ AndersonTorres ];
132+ maintainers = with maintainers; [ ];
130133 platforms = platforms.linux ++ platforms.darwin;
131134 badPlatforms = [ "x86_64-darwin" ];
132135 };
pkgs/development/libraries/wxwidgets/0001-fix-assertion-using-hide-in-destroy.patch → pkgs/development/libraries/wxwidgets/patches/0001-fix-assertion-using-hide-in-destroy.patchrenamed

The content is the same.

pkgs/top-level/all-packages.nix+8−2
@@ -20502,20 +20502,26 @@ with pkgs;
2050220502 wxformbuilder = callPackage ../development/tools/wxformbuilder { };
2050320503
2050420504 wxGTK = wxGTK28;
20505−
2050620505 wxGTK30 = wxGTK30-gtk2;
2050720506 wxGTK31 = wxGTK31-gtk2;
2050820507
2050920508 wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
2051020509
20511− wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { };
20510+ wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
20511+ inherit (darwin.stubs) setfile;
20512+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
20513+ };
2051220514
2051320515 wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
2051420516 withGtk2 = true;
20517+ inherit (darwin.stubs) setfile;
20518+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
2051520519 };
2051620520
2051720521 wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
2051820522 withGtk2 = false;
20523+ inherit (darwin.stubs) setfile;
20524+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
2051920525 };
2052020526
2052120527 wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {