Unverified Commit 8aba6295 authored by misuzu's avatar misuzu Committed by GitHub
Browse files

wxGTK3{1,2}: use new darwin sdk pattern (#369685)

parents 47d83df7 3550cccc

pkgs/development/libraries/wxwidgets/wxGTK31.nix

+2 −18
Original line number Diff line number Diff line
@@ -23,14 +23,7 @@ 
  withWebKit ? stdenv.hostPlatform.isDarwin,

  webkitgtk_4_0,

  setfile,

  AGL,

  Carbon,

  Cocoa,

  Kernel,

  QTKit,

  AVFoundation,

  AVKit,

  WebKit,

  libpng,

}:



stdenv.mkDerivation rec {
@@ -68,20 +61,11 @@ stdenv.mkDerivation rec { 
    ++ lib.optional withCurl curl

    ++ lib.optional withMesa libGLU

    ++ lib.optional (withWebKit && !stdenv.hostPlatform.isDarwin) webkitgtk_4_0

    ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit

    ++ lib.optionals stdenv.hostPlatform.isDarwin [

      setfile

      Carbon

      Cocoa

      Kernel

      QTKit

      AVFoundation

      AVKit

      WebKit

      libpng

    ];



  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;



  configureFlags =

    [

      "--disable-precomp-headers"

pkgs/development/libraries/wxwidgets/wxGTK32.nix

+0 −18
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ 
, withWebKit ? true

, webkitgtk_4_0

, setfile

, AGL

, Carbon

, Cocoa

, Kernel

, QTKit

, AVFoundation

, AVKit

, WebKit

}:

let

  catch = fetchFromGitHub {
@@ -81,21 +73,11 @@ stdenv.mkDerivation rec { 
  ]

  ++ lib.optional withMesa libGLU

  ++ lib.optional (withWebKit && stdenv.hostPlatform.isLinux) webkitgtk_4_0

  ++ lib.optional (withWebKit && stdenv.hostPlatform.isDarwin) WebKit

  ++ lib.optionals stdenv.hostPlatform.isDarwin [

    expat

    setfile

    Carbon

    Cocoa

    Kernel

    QTKit

    AVFoundation

    AVKit

    WebKit

  ];



  propagatedBuildInputs = lib.optional stdenv.hostPlatform.isDarwin AGL;



  configureFlags = [

    "--disable-precomp-headers"

    # This is the default option, but be explicit

pkgs/top-level/all-packages.nix

+0 −2
Original line number Diff line number Diff line
@@ -10968,12 +10968,10 @@ with pkgs; 














  wxGTK31 = callPackage ../development/libraries/wxwidgets/wxGTK31.nix {















    inherit (darwin.stubs) setfile;













    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;















  };





























  wxGTK32 = callPackage ../development/libraries/wxwidgets/wxGTK32.nix {















    inherit (darwin.stubs) setfile;













    inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit AVFoundation AVKit WebKit;















  };





























  wxSVG = callPackage ../development/libraries/wxSVG {