From 0b06db69f50d1d0dace7566c3511225fb494ea50 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 19:14:17 -0700 Subject: [PATCH] wxSVG: unbreak on Darwin --- pkgs/development/libraries/wxSVG/default.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/wxSVG/default.nix b/pkgs/development/libraries/wxSVG/default.nix index 05a4655b800..a8c97bb5b49 100644 --- a/pkgs/development/libraries/wxSVG/default.nix +++ b/pkgs/development/libraries/wxSVG/default.nix @@ -7,6 +7,8 @@ , pango , pkg-config , wxGTK +# darwin deps +, Cocoa }: stdenv.mkDerivation rec { @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { libexif pango wxGTK - ]; + ] ++ lib.optional stdenv.isDarwin Cocoa; meta = with lib; { homepage = "http://wxsvg.sourceforge.net/"; @@ -37,9 +39,8 @@ stdenv.mkDerivation rec { wxSVG is C++ library to create, manipulate and render Scalable Vector Graphics (SVG) files with the wxWidgets toolkit. ''; - license = with licenses; gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = wxGTK.meta.platforms; - broken = stdenv.isDarwin; + license = licenses.gpl2Plus; + maintainers = [ maintainers.AndersonTorres ]; + inherit (wxGTK.meta) platforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee9a08873a..5f7116ed3fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21231,6 +21231,7 @@ with pkgs; wxSVG = callPackage ../development/libraries/wxSVG { wxGTK = wxGTK30-gtk3; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; wtk = callPackage ../development/libraries/wtk { };