diff --git a/pkgs/applications/networking/p2p/torrential/default.nix b/pkgs/applications/networking/p2p/torrential/default.nix index cbeb6afa4088..7290ec65ad56 100644 --- a/pkgs/applications/networking/p2p/torrential/default.nix +++ b/pkgs/applications/networking/p2p/torrential/default.nix @@ -1,56 +1,70 @@ { lib, stdenv , fetchFromGitHub , nix-update-script -, cmake +, desktop-file-utils +, meson +, ninja , pkg-config -, vala_0_40 -, pantheon +, python3 +, vala +, wrapGAppsHook , curl +, dht , glib , gtk3 , libb64 , libevent , libgee , libnatpmp -, libunity +, libtransmission +, libutp , miniupnpc , openssl -, wrapGAppsHook +, pantheon }: stdenv.mkDerivation rec { pname = "torrential"; - version = "1.1.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "davidmhewitt"; repo = "torrential"; rev = version; - fetchSubmodules = true; - sha256 = "17aby0c17ybyzyzyc1cg1j6q1a186801fy84avlaxahqp7vdammx"; + sha256 = "sha256-78eNIz7Lgeq4LTog04TMNuL27Gv0UZ0poBaw8ia1R/g="; }; nativeBuildInputs = [ - cmake - vala_0_40 # https://github.com/davidmhewitt/torrential/issues/135 + desktop-file-utils + meson + ninja pkg-config + python3 + vala wrapGAppsHook ]; buildInputs = [ curl + dht glib gtk3 libb64 libevent libgee libnatpmp - libunity + libtransmission + libutp miniupnpc openssl pantheon.granite ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + passthru = { updateScript = nix-update-script { attrPath = pname; @@ -60,8 +74,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS"; homepage = "https://github.com/davidmhewitt/torrential"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; - license = licenses.gpl3; + license = licenses.gpl2Plus; }; }