git.iko.soy/typeable/nixpkgs
on master help sign in
wxGTK29: fixed Darwin build
commit10836bdd3675babf9898d729838be99ffa5904d0 authorMatthew Daiter <mdaiter8121@gmail.com> dateFri 30 Dec 2016, 19:16 (10 years ago) parentdf5f880
2 files changed+11−4
pkgs/development/libraries/wxGTK-2.9/default.nix+10−4 pkgs/top-level/all-packages.nix+1
pkgs/development/libraries/wxGTK-2.9/default.nix+10−4
@@ -1,6 +1,7 @@
11{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto
22, 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+, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null
45}:
56
67assert withMesa -> mesa != null;
@@ -22,10 +23,12 @@ stdenv.mkDerivation {
2223 [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer
2324 gst_plugins_base GConf ]
2425 ++ optional withMesa mesa
25− ++ optional stdenv.isDarwin setfile;
26+ ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ];
2627
2728 nativeBuildInputs = [ pkgconfig ];
2829
30+ propagatedBuildInputs = optional stdenv.isDarwin AGL;
31+
2932 configureFlags =
3033 [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl"
3134 (if compat24 then "--enable-compat24" else "--disable-compat24")
@@ -34,7 +37,7 @@ stdenv.mkDerivation {
3437 ++ optional withMesa "--with-opengl"
3538 ++ optionals stdenv.isDarwin
3639 # allow building on 64-bit
37− [ "--with-cocoa" "--enable-universal-binaries" ];
40+ [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ];
3841
3942 SEARCH_LIB = optionalString withMesa "${mesa}/lib";
4043
@@ -46,6 +49,9 @@ stdenv.mkDerivation {
4649 substituteInPlace configure --replace \
4750 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \
4851 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"'
52+ substituteInPlace configure --replace \
53+ "-framework System" \
54+ -lSystem
4955 '';
5056
5157 postInstall = "
@@ -60,6 +66,6 @@ stdenv.mkDerivation {
6066 enableParallelBuilding = true;
6167
6268 meta = {
63− platforms = stdenv.lib.platforms.linux;
69+ platforms = with stdenv.lib.platforms; darwin ++ linux;
6470 };
6571}
pkgs/top-level/all-packages.nix+1
@@ -9670,6 +9670,7 @@ in
96709670 wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix {
96719671 inherit (gnome2) GConf;
96729672 inherit (darwin.stubs) setfile;
9673+ inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime;
96739674 withMesa = lib.elem system lib.platforms.mesaPlatforms;
96749675 };
96759676