colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #259361 from doronbehar/pkg/transmission

Browse Source 
transmission_4: fix darwin build
This commit is contained in:
Doron Behar 2023-10-07 11:07:40 +03:00 committed by GitHub
commit 34d8d08fdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/p2p/transmission/4.nix
View File

@ -21,7 +21,7 @@
, dht
, libnatpmp
, libiconv
, darwin
, Foundation
# Build options
, enableGTK3 ? false
, gtkmm3
@ -37,14 +37,14 @@
, apparmorRulesFromClosure
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "transmission";
version = "4.0.4";
src = fetchFromGitHub {
owner = "transmission";
repo = "transmission";
rev = version;
rev = finalAttrs.version;
hash = "sha256-Sz3+5VvfOgET1aiormEnBOrF+yN79tiSQvjLAoGqTLw=";
fetchSubmodules = true;
};
@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
++ 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 rec {
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;
};
}
})

11
pkgs/applications/networking/p2p/transmission/default.nix
View File

@ -32,17 +32,14 @@
, apparmorRulesFromClosure
}:
let
version = "3.00";
in stdenv.mkDerivation {
stdenv.mkDerivation (finalAttrs: {
pname = "transmission";
inherit version;
version = "3.00";
src = fetchFromGitHub {
owner = "transmission";
repo = "transmission";
rev = version;
rev = finalAttrs.version;
sha256 = "0ccg0km54f700x9p0jsnncnwvfnxfnxf7kcm7pcx1cj0vw78924z";
fetchSubmodules = true;
};
@ -147,4 +144,4 @@ in stdenv.mkDerivation {
platforms = lib.platforms.unix;
};
}
})

4
pkgs/top-level/all-packages.nix
View File

@ -36119,7 +36119,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;
};