From 2e99cc48c7715a036b89f93c3dd297de4b386368 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 4 Nov 2024 12:42:20 -0500 Subject: [PATCH 1/2] transmission_4: update for the new SDK pattern on Darwin --- pkgs/applications/networking/p2p/transmission/4.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 25296efe6926..bb13d2bcc828 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -145,8 +145,7 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ]) ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableSystemd [ systemd ] - ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ] - ++ optionals stdenv.hostPlatform.isDarwin [ libiconv Foundation ]; + ++ optionals stdenv.hostPlatform.isLinux [ inotify-tools ]; postInstall = '' mkdir $apparmor From 174ef9b84ac4286e298d9283f5a2ca27baafb258 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Mon, 4 Nov 2024 12:42:20 -0500 Subject: [PATCH 2/2] transmission_4: fix build on Darwin Transmission detects gettext and tries to enable support on Darwin but fails without this substitution. --- pkgs/applications/networking/p2p/transmission/4.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index bb13d2bcc828..900fd4a3974b 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -113,6 +113,10 @@ stdenv.mkDerivation (finalAttrs: { cmake/FindUtfCpp.cmake # Upstream uses different config file name. substituteInPlace CMakeLists.txt --replace 'find_package(UtfCpp)' 'find_package(utf8cpp)' + + # Use gettext even on Darwin + substituteInPlace libtransmission/utils.h \ + --replace-fail '#if defined(HAVE_GETTEXT) && !defined(__APPLE__)' '#if defined(HAVE_GETTEXT)' ''; nativeBuildInputs = [