From d304496834944199a1e33973007b144171eea493 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 18:24:45 -0700 Subject: [PATCH 1/5] wxGTK30-gtk2,wxGTK30-gtk3: add missing buildInput on Darwin --- pkgs/development/libraries/wxwidgets/wxGTK30.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK30.nix b/pkgs/development/libraries/wxwidgets/wxGTK30.nix index 6157786a5d04..82005a12dd2f 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK30.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK30.nix @@ -18,6 +18,7 @@ , withGtk2 ? true , withWebKit ? false, webkitgtk , AGL +, AVFoundation , Carbon , Cocoa , Kernel @@ -57,6 +58,7 @@ stdenv.mkDerivation rec { ++ lib.optional withMesa libGLU ++ lib.optional withWebKit webkitgtk ++ lib.optionals stdenv.isDarwin [ + AVFoundation Carbon Cocoa Kernel @@ -130,7 +132,6 @@ stdenv.mkDerivation rec { license = licenses.wxWindows; maintainers = with maintainers; [ ]; platforms = platforms.linux ++ platforms.darwin; - badPlatforms = [ "x86_64-darwin" ]; }; passthru = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1271dded51a3..bee9a08873a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21212,7 +21212,7 @@ with pkgs; wxGTK30 = callPackage ../development/libraries/wxwidgets/wxGTK30.nix { withGtk2 = true; inherit (darwin.stubs) setfile; - inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; + inherit (darwin.apple_sdk.frameworks) AGL AVFoundation Carbon Cocoa Kernel QTKit; }; wxGTK30-gtk2 = wxGTK30.override { withGtk2 = true; }; wxGTK30-gtk3 = wxGTK30.override { withGtk2 = false; }; From 0b06db69f50d1d0dace7566c3511225fb494ea50 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 19:14:17 -0700 Subject: [PATCH 2/5] 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 05a4655b800f..a8c97bb5b49b 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 bee9a08873a2..5f7116ed3fc7 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 { }; From 9590fedbf932773b3b40ef8647a1e63b3342acd3 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 19:37:00 -0700 Subject: [PATCH 3/5] amule,amule-gui: mark as broken on Darwin --- pkgs/tools/networking/p2p/amule/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index fc389f2c4dc4..9431da7cf468 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ ]; platforms = platforms.unix; # cmake fails: Cannot specify link libraries for target "wxWidgets::ADV" which is not built by this project. - broken = enableDaemon; + broken = enableDaemon || stdenv.isDarwin; }; } From abff737e36fa4d556eaec1bc9c216508abc11c9d Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 15 Jun 2022 19:54:23 -0700 Subject: [PATCH 4/5] bochs: mark as broken on Darwin --- pkgs/applications/emulators/bochs/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/emulators/bochs/default.nix b/pkgs/applications/emulators/bochs/default.nix index 1f02219c8314..f766bd9def94 100644 --- a/pkgs/applications/emulators/bochs/default.nix +++ b/pkgs/applications/emulators/bochs/default.nix @@ -130,6 +130,7 @@ stdenv.mkDerivation rec { license = licenses.lgpl2Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } # TODO: a better way to organize the options From 135836b31bd68eec6a02205f2056cfc672301494 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Thu, 16 Jun 2022 10:32:07 -0700 Subject: [PATCH 5/5] wxsqliteplus: fix Darwin build --- .../libraries/wxsqliteplus/default.nix | 19 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 7cf5484bef77..fecd61bb6e51 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite }: +{ lib, stdenv, fetchFromGitHub, wxGTK, wxsqlite3, sqlite, Cocoa, setfile }: stdenv.mkDerivation rec { pname = "wxsqliteplus"; @@ -11,27 +11,32 @@ stdenv.mkDerivation rec { sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; - buildInputs = [ wxGTK wxsqlite3 sqlite ]; + buildInputs = [ wxGTK wxsqlite3 sqlite ] ++ lib.optional stdenv.isDarwin Cocoa; makeFlags = [ "LDFLAGS=-L${wxsqlite3}/lib" + ] ++ lib.optionals stdenv.isDarwin [ + "SETFILE=${setfile}/bin/SetFile" ]; preBuild = '' sed -ie 's|all: $(LIBPREFIX)wxsqlite$(LIBEXT)|all: |g' Makefile sed -ie 's|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) $(LIBPREFIX)wxsqlite$(LIBEXT)|wxsqliteplus$(EXEEXT): $(WXSQLITEPLUS_OBJECTS) |g' Makefile - sed -ie 's|-lwxsqlite |-lwxcode_gtk2u_wxsqlite3-3.0 |g' Makefile + sed -ie 's|-lwxsqlite |-lwxcode_${if stdenv.isDarwin then "osx_cocoau_wxsqlite3-3.0.0" else "gtk2u_wxsqlite3-3.0"} |g' Makefile ''; installPhase = '' - install -D wxsqliteplus $out/bin/wxsqliteplus + install -D ${lib.optionalString stdenv.isDarwin "wxsqliteplus.app/Contents/MacOS/"}wxsqliteplus $out/bin/wxsqliteplus + '' + lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv wxsqliteplus.app $out/Applications/ ''; meta = with lib; { - homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; - platforms = platforms.unix; - maintainers = with maintainers; [ vrthra ]; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; license = licenses.gpl2; + maintainers = [ maintainers.vrthra ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f7116ed3fc7..dff023482737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35053,6 +35053,8 @@ with pkgs; wxsqliteplus = callPackage ../development/libraries/wxsqliteplus { wxGTK = wxGTK30; + inherit (darwin.apple_sdk.frameworks) Cocoa; + inherit (darwin.stubs) setfile; }; x11idle = callPackage ../tools/misc/x11idle {};