git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21539 from mdaiter/wxGTK30Mac
da34b32Daiderd Jordan
pkgs/development/libraries/wxGTK-3.0/default.nix+9−3
compare with master
unifiedsplit
@@ -2,6 +2,7 @@
2, gstreamer, gst_plugins_base, GConf, setfile
2, gstreamer, gst_plugins_base, GConf, setfile
3, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
3, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true
4, withWebKit ? false, webkitgtk2 ? null
4, withWebKit ? false, webkitgtk2 ? null
5+, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null
5}:
6}:
6
7
7
8
@@ -26,10 +27,12 @@ stdenv.mkDerivation {
26 gst_plugins_base GConf ]
27 gst_plugins_base GConf ]
27 ++ optional withMesa mesa
28 ++ optional withMesa mesa
28 ++ optional withWebKit webkitgtk2
29 ++ optional withWebKit webkitgtk2
29− ++ optional stdenv.isDarwin setfile;
30+ ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ];
30
31
31 nativeBuildInputs = [ pkgconfig ];
32 nativeBuildInputs = [ pkgconfig ];
32
33
34+ propagatedBuildInputs = optional stdenv.isDarwin AGL;
35+
33 configureFlags =
36 configureFlags =
34 [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
37 [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
35 (if compat24 then "--enable-compat24" else "--disable-compat24")
38 (if compat24 then "--enable-compat24" else "--disable-compat24")
@@ -38,7 +41,7 @@ stdenv.mkDerivation {
38 ++ optional withMesa "--with-opengl"
41 ++ optional withMesa "--with-opengl"
39 ++ optionals stdenv.isDarwin
42 ++ optionals stdenv.isDarwin
40 # allow building on 64-bit
43 # allow building on 64-bit
41− [ "--with-cocoa" "--enable-universal-binaries" ]
44+ [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]
42 ++ optionals withWebKit
45 ++ optionals withWebKit
43 ["--enable-webview" "--enable-webview-webkit"];
46 ["--enable-webview" "--enable-webview-webkit"];
44
47
@@ -52,6 +55,9 @@ stdenv.mkDerivation {
52 substituteInPlace configure --replace \
55 substituteInPlace configure --replace \
53 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
56 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
54 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
57 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
58+ substituteInPlace configure --replace \
59+ "-framework System" \
60+ -lSystem
55 '';
61 '';
56
62
57 postInstall = "
63 postInstall = "
@@ -66,6 +72,6 @@ stdenv.mkDerivation {
66 enableParallelBuilding = true;
72 enableParallelBuilding = true;
67
73
68 meta = {
74 meta = {
69− platforms = stdenv.lib.platforms.linux;
75+ platforms = with stdenv.lib.platforms; darwin ++ linux;
70 };
76 };
71}
77}
pkgs/top-level/all-packages.nix+1
@@ -9693,6 +9693,7 @@ in
9693 wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
9693 wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix {
9694 inherit (gnome2) GConf;
9694 inherit (gnome2) GConf;
9695 inherit (darwin.stubs) setfile;
9695 inherit (darwin.stubs) setfile;
9696+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit;
9696 withMesa = lib.elem system lib.platforms.mesaPlatforms;
9697 withMesa = lib.elem system lib.platforms.mesaPlatforms;
9697 };
9698 };
9698
9699