From 95e87e71c58c496acb7a9d56ae707051d2bfb900 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 Feb 2012 16:24:02 +0000 Subject: [PATCH] * Tribler: optionally support streaming playback of torrents via VLC. svn path=/nixpkgs/trunk/; revision=32306 --- pkgs/applications/networking/p2p/tribler/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index 24796880fb2..4e02eb9f1e6 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: +{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools +, enablePlayer ? false, vlc ? null }: let rev = "24912"; in @@ -34,7 +35,10 @@ stdenv.mkDerivation { --set _TRIBLERPATH $out/share/tribler \ --set PYTHONPATH $out/share/tribler:$program_PYTHONPATH \ --run 'cd $_TRIBLERPATH' \ - --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" + --add-flags "-O $out/share/tribler/Tribler/Main/tribler.py" \ + ${stdenv.lib.optionalString enablePlayer '' + --prefix LD_LIBRARY_PATH : ${vlc}/lib + ''} ''; meta = {