diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/p2p/transmission')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix | 18 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix | 12 |
2 files changed, 16 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix index 05d757d53a2c..78f5b6cf2543 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/4.nix @@ -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 @@ -141,8 +141,14 @@ stdenv.mkDerivation rec { EOF ''; + passthru.tests = { + apparmor = nixosTests.transmission_4; # starts the service with apparmor enabled + smoke-test = nixosTests.bittorrent; + }; + meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. @@ -158,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; }; -} +}) diff --git a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix index cc82c5038083..58de6fa9754f 100644 --- a/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix +++ b/nixpkgs/pkgs/applications/networking/p2p/transmission/default.nix @@ -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; }; @@ -129,6 +126,7 @@ in stdenv.mkDerivation { meta = { description = "A fast, easy and free BitTorrent client"; + mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; longDescription = '' Transmission is a BitTorrent client which features a simple interface on top of a cross-platform back-end. @@ -146,4 +144,4 @@ in stdenv.mkDerivation { platforms = lib.platforms.unix; }; -} +}) |