tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
wxwidgets: remove darwin from inputs
AndersonTorres
4 years ago
b7304edb
211ec209
+25
-15
5 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
wxwidgets
2.8
default.nix
2.9
default.nix
3.0
default.nix
patches
0001-fix-assertion-using-hide-in-destroy.patch
top-level
all-packages.nix
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
+1
-1
pkgs/development/libraries/wxwidgets/2.8/default.nix
···
106
106
database support, HTML viewing and printing, and much more.
107
107
'';
108
108
license = licenses.wxWindows;
109
109
-
maintainers = with maintainers; [ AndersonTorres ];
109
109
+
maintainers = with maintainers; [ ];
110
110
platforms = platforms.linux;
111
111
};
112
112
+8
-7
pkgs/development/libraries/wxwidgets/2.9/default.nix
···
14
14
, compat26 ? true
15
15
, unicode ? true
16
16
, withMesa ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms
17
17
-
, darwin
17
17
+
, AGL
18
18
+
, Carbon
19
19
+
, Cocoa
20
20
+
, Kernel
21
21
+
, QuickTime
22
22
+
, setfile
18
23
}:
19
24
20
25
assert withMesa -> libGLU != null && libGL != null;
21
21
-
let
22
22
-
inherit (darwin.stubs) setfile;
23
23
-
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
24
24
-
in
25
26
stdenv.mkDerivation rec {
26
27
pname = "wxGTK";
27
28
version = "2.9.5";
···
35
36
36
37
patches = [
37
38
# https://github.com/wxWidgets/wxWidgets/issues/17942
38
38
-
../0001-fix-assertion-using-hide-in-destroy.patch
39
39
+
../patches/0001-fix-assertion-using-hide-in-destroy.patch
39
40
];
40
41
41
42
nativeBuildInputs = [
···
115
116
database support, HTML viewing and printing, and much more.
116
117
'';
117
118
license = licenses.wxWindows;
118
118
-
maintainers = with maintainers; [ AndersonTorres ];
119
119
+
maintainers = with maintainers; [ ];
119
120
platforms = platforms.darwin ++ platforms.linux;
120
121
badPlatforms = [ "x86_64-darwin" ];
121
122
};
+8
-5
pkgs/development/libraries/wxwidgets/3.0/default.nix
···
17
17
, unicode ? true
18
18
, withGtk2 ? true
19
19
, withWebKit ? false, webkitgtk
20
20
-
, darwin
20
20
+
, AGL
21
21
+
, Carbon
22
22
+
, Cocoa
23
23
+
, Kernel
24
24
+
, QTKit
25
25
+
, setfile
21
26
}:
22
27
23
28
assert withGtk2 -> (!withWebKit);
24
29
25
30
let
26
26
-
inherit (darwin.stubs) setfile;
27
27
-
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
28
31
inherit (gst_all_1) gstreamer gst-plugins-base;
29
32
gtk = if withGtk2 then gtk2 else gtk3;
30
33
in
···
66
69
67
70
patches = [
68
71
# https://github.com/wxWidgets/wxWidgets/issues/17942
69
69
-
../0001-fix-assertion-using-hide-in-destroy.patch
72
72
+
../patches/0001-fix-assertion-using-hide-in-destroy.patch
70
73
];
71
74
72
75
configureFlags = [
···
126
129
database support, HTML viewing and printing, and much more.
127
130
'';
128
131
license = licenses.wxWindows;
129
129
-
maintainers = with maintainers; [ AndersonTorres ];
132
132
+
maintainers = with maintainers; [ ];
130
133
platforms = platforms.linux ++ platforms.darwin;
131
134
badPlatforms = [ "x86_64-darwin" ];
132
135
};
+8
-2
pkgs/top-level/all-packages.nix
···
20502
20502
wxformbuilder = callPackage ../development/tools/wxformbuilder { };
20503
20503
20504
20504
wxGTK = wxGTK28;
20505
20505
-
20506
20505
wxGTK30 = wxGTK30-gtk2;
20507
20506
wxGTK31 = wxGTK31-gtk2;
20508
20507
20509
20508
wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { };
20510
20509
20511
20511
-
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { };
20510
20510
+
wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 {
20511
20511
+
inherit (darwin.stubs) setfile;
20512
20512
+
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
20513
20513
+
};
20512
20514
20513
20515
wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 {
20514
20516
withGtk2 = true;
20517
20517
+
inherit (darwin.stubs) setfile;
20518
20518
+
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
20515
20519
};
20516
20520
20517
20521
wxGTK30-gtk3 = callPackage ../development/libraries/wxwidgets/3.0 {
20518
20522
withGtk2 = false;
20523
20523
+
inherit (darwin.stubs) setfile;
20524
20524
+
inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
20519
20525
};
20520
20526
20521
20527
wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 {