diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-09-10 12:06:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-09-10 12:07:24 +0200 |
| commit | bcd382f032a5e380ffc0956e0a4539cf9cefe967 (patch) | |
| tree | 83b0ebd39be97bb5110255fb1f52255425c3cd81 /pkgs/applications/networking/p2p/tribler | |
| parent | 450685e46d53f5eb9e10bb12cf9200914b6542d0 (diff) | |
| download | nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar.gz nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar.bz2 nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar.lz nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar.xz nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.tar.zst nixpkgs-bcd382f032a5e380ffc0956e0a4539cf9cefe967.zip | |
tribler: 7.0.0-beta -> 7.0.0-rc2
Also, fix the xcb plugin error (https://github.com/NixOS/nixpkgs/issues/24256) and add service-identity which is a required dependency now.
Diffstat (limited to 'pkgs/applications/networking/p2p/tribler')
| -rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 8e99d5159f8..e5c0e30bce3 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,17 +1,15 @@ -{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick -, enablePlayer ? true, vlc ? null }: +{ stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick +, enablePlayer ? true, vlc ? null, qt5 }: stdenv.mkDerivation rec { pname = "tribler"; name = "${pname}-${version}"; - version = "7.0.0-beta"; + version = "7.0.0-rc2"; revision = "1d3ddb8"; - src = fetchgit { - url = "https://github.com/Tribler/tribler"; - rev = revision; - sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845"; - fetchSubmodules = true; + src = fetchurl { + url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz"; + sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2"; }; buildInputs = [ @@ -41,6 +39,7 @@ stdenv.mkDerivation rec { pythonPackages.plyvel pythonPackages.decorator pythonPackages.feedparser + pythonPackages.service-identity ]; postPatch = '' @@ -58,6 +57,7 @@ stdenv.mkDerivation rec { wrapPythonPrograms cp -prvd ./* $out/ makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qt5.qtbase.bin}/lib/qt-*/plugins/platforms \ --set _TRIBLERPATH $out \ --set PYTHONPATH $out:$program_PYTHONPATH \ --set NO_AT_BRIDGE 1 \ |