pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #259361 from doronbehar/pkg/transmission

transmission_4: fix darwin build

authored by

Doron Behar and committed by
GitHub 34d8d08f 51bc5df8

+12 -15
unified split
+5 -7
pkgs/applications/networking/p2p/transmission/4.nix
··· 21 , dht 22 , libnatpmp 23 , libiconv 24 - , darwin 25 # Build options 26 , enableGTK3 ? false 27 , gtkmm3 ··· 37 , apparmorRulesFromClosure 38 }: 39 40 - stdenv.mkDerivation rec { 41 pname = "transmission"; 42 version = "4.0.4"; 43 44 src = fetchFromGitHub { 45 owner = "transmission"; 46 repo = "transmission"; 47 - rev = version; 48 hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw="; 49 fetchSubmodules = true; 50 }; ··· 113 ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] 114 ++ lib.optionals enableSystemd [ systemd ] 115 ++ lib.optionals stdenv.isLinux [ inotify-tools ] 116 - ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Foundation ]; 117 118 postInstall = '' 119 mkdir $apparmor ··· 164 license = with lib.licenses; [ gpl2Plus mit ]; 165 maintainers = with lib.maintainers; [ astsmtl ]; 166 platforms = lib.platforms.unix; 167 - # Needs macOS >= 10.14.6 168 - broken = stdenv.isDarwin && stdenv.isx86_64; 169 }; 170 - }
··· 21 , dht 22 , libnatpmp 23 , libiconv 24 + , Foundation 25 # Build options 26 , enableGTK3 ? false 27 , gtkmm3 ··· 37 , apparmorRulesFromClosure 38 }: 39 40 + stdenv.mkDerivation (finalAttrs: { 41 pname = "transmission"; 42 version = "4.0.4"; 43 44 src = fetchFromGitHub { 45 owner = "transmission"; 46 repo = "transmission"; 47 + rev = finalAttrs.version; 48 hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw="; 49 fetchSubmodules = true; 50 }; ··· 113 ++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] 114 ++ lib.optionals enableSystemd [ systemd ] 115 ++ lib.optionals stdenv.isLinux [ inotify-tools ] 116 + ++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; 117 118 postInstall = '' 119 mkdir $apparmor ··· 164 license = with lib.licenses; [ gpl2Plus mit ]; 165 maintainers = with lib.maintainers; [ astsmtl ]; 166 platforms = lib.platforms.unix; 167 }; 168 + })
+4 -7
pkgs/applications/networking/p2p/transmission/default.nix
··· 32 , apparmorRulesFromClosure 33 }: 34 35 - let 36 version = "3.00"; 37 38 - in stdenv.mkDerivation { 39 - pname = "transmission"; 40 - inherit version; 41 - 42 src = fetchFromGitHub { 43 owner = "transmission"; 44 repo = "transmission"; 45 - rev = version; 46 sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; 47 fetchSubmodules = true; 48 }; ··· 147 platforms = lib.platforms.unix; 148 }; 149 150 - }
··· 32 , apparmorRulesFromClosure 33 }: 34 35 + stdenv.mkDerivation (finalAttrs: { 36 + pname = "transmission"; 37 version = "3.00"; 38 39 src = fetchFromGitHub { 40 owner = "transmission"; 41 repo = "transmission"; 42 + rev = finalAttrs.version; 43 sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z"; 44 fetchSubmodules = true; 45 }; ··· 144 platforms = lib.platforms.unix; 145 }; 146 147 + })
+3 -1
pkgs/top-level/all-packages.nix
··· 36119 transmission-gtk = transmission.override { enableGTK3 = true; }; 36120 transmission-qt = transmission.override { enableQt = true; }; 36121 36122 - transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix { 36123 fmt = fmt_9; 36124 libutp = libutp_3_4; 36125 };
··· 36119 transmission-gtk = transmission.override { enableGTK3 = true; }; 36120 transmission-qt = transmission.override { enableQt = true; }; 36121 36122 + # Needs macOS >= 10.14.6 36123 + transmission_4 = darwin.apple_sdk_11_0.callPackage ../applications/networking/p2p/transmission/4.nix { 36124 + inherit (darwin.apple_sdk_11_0.frameworks) Foundation; 36125 fmt = fmt_9; 36126 libutp = libutp_3_4; 36127 };