From f5cd0b91dc43dd5096ef1d46104535870ffd70fa Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 5 Oct 2023 11:46:46 +0300 Subject: [PATCH] transmission_4: fix darwin build --- pkgs/applications/networking/p2p/transmission/4.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index b3f2ff0b0d5e..78f5b6cf2543 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -21,7 +21,7 @@ , dht , libnatpmp , libiconv -, darwin +, Foundation # Build options , enableGTK3 ? false , gtkmm3 @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ lib.optionals enableSystemd [ systemd ] ++ lib.optionals stdenv.isLinux [ inotify-tools ] - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ]; + ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; postInstall = '' mkdir $apparmor @@ -164,7 +164,5 @@ stdenv.mkDerivation (finalAttrs: { license = with lib.licenses; [ gpl2Plus mit ]; maintainers = with lib.maintainers; [ astsmtl ]; platforms = lib.platforms.unix; - # Needs macOS >= 10.14.6 - broken = stdenv.isDarwin && stdenv.isx86_64; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2465258dea29..513be34cb797 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36102,7 +36102,9 @@ with pkgs; transmission-gtk = transmission.override { enableGTK3 = true; }; transmission-qt = transmission.override { enableQt = true; }; - transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix { + # Needs macOS >= 10.14.6 + transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix { + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; fmt = fmt_9; libutp = libutp_3_4; };