From 10836bdd3675babf9898d729838be99ffa5904d0 Mon Sep 17 00:00:00 2001 From: Matthew Daiter Date: Fri, 30 Dec 2016 19:16:20 +0100 Subject: [PATCH] wxGTK29: fixed Darwin build --- pkgs/development/libraries/wxGTK-2.9/default.nix | 14 ++++++++++---- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index 82ba9daed80..b2f40978f51 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile -, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, +, withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true +, Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: assert withMesa -> mesa != null; @@ -22,10 +23,12 @@ stdenv.mkDerivation { [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa - ++ optional stdenv.isDarwin setfile; + ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; + propagatedBuildInputs = optional stdenv.isDarwin AGL; + configureFlags = [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" (if compat24 then "--enable-compat24" else "--disable-compat24") @@ -34,7 +37,7 @@ stdenv.mkDerivation { ++ optional withMesa "--with-opengl" ++ optionals stdenv.isDarwin # allow building on 64-bit - [ "--with-cocoa" "--enable-universal-binaries" ]; + [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; SEARCH_LIB = optionalString withMesa "${mesa}/lib"; @@ -46,6 +49,9 @@ stdenv.mkDerivation { substituteInPlace configure --replace \ 'ac_cv_prog_SETFILE="/Developer/Tools/SetFile"' \ 'ac_cv_prog_SETFILE="${setfile}/bin/SetFile"' + substituteInPlace configure --replace \ + "-framework System" \ + -lSystem ''; postInstall = " @@ -60,6 +66,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - platforms = stdenv.lib.platforms.linux; + platforms = with stdenv.lib.platforms; darwin ++ linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a9c86813cf1..dbc70dbb416 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9670,6 +9670,7 @@ in wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { inherit (gnome2) GConf; inherit (darwin.stubs) setfile; + inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; withMesa = lib.elem system lib.platforms.mesaPlatforms; };