ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

tribler: 7.0.0-beta -> 7.0.0-rc2

Browse Source 
Also, fix the xcb plugin error
(https://github.com/NixOS/nixpkgs/issues/24256) and add service-identity which is a required dependency now.
This commit is contained in:
Eelco Dolstra 2017-09-10 12:06:01 +02:00
parent 450685e46d
commit bcd382f032
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/applications/networking/p2p/tribler/default.nix
View File

@ -1,17 +1,15 @@
{ stdenv, fetchgit, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick { stdenv, fetchurl, pythonPackages, makeWrapper, nettools, libtorrentRasterbar, imagemagick
, enablePlayer ? true, vlc ? null }: , enablePlayer ? true, vlc ? null, qt5 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tribler"; pname = "tribler";
name = "${pname}-${version}"; name = "${pname}-${version}";
version = "7.0.0-beta"; version = "7.0.0-rc2";
revision = "1d3ddb8"; revision = "1d3ddb8";
src = fetchgit { src = fetchurl {
url = "https://github.com/Tribler/tribler"; url = "https://github.com/Tribler/tribler/releases/download/v${version}/Tribler-v${version}.tar.xz";
rev = revision; sha256 = "0wlv32cw52c5khnrm218dccgn2l177933p4dhp7m50hipqfb0ly2";
sha256 = "16mk76qgg7fgca11yvpygicxqbkc0kn6r82x73fly2310pagd845";
fetchSubmodules = true;
}; };
buildInputs = [ buildInputs = [
@ -41,6 +39,7 @@ stdenv.mkDerivation rec {
pythonPackages.plyvel pythonPackages.plyvel
pythonPackages.decorator pythonPackages.decorator
pythonPackages.feedparser pythonPackages.feedparser
pythonPackages.service-identity
]; ];
postPatch = '' postPatch = ''
@ -58,6 +57,7 @@ stdenv.mkDerivation rec {
wrapPythonPrograms wrapPythonPrograms
cp -prvd ./* $out/ cp -prvd ./* $out/
makeWrapper ${pythonPackages.python}/bin/python $out/bin/tribler \ 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 _TRIBLERPATH $out \
--set PYTHONPATH $out:$program_PYTHONPATH \ --set PYTHONPATH $out:$program_PYTHONPATH \
--set NO_AT_BRIDGE 1 \ --set NO_AT_BRIDGE 1 \