diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-15 16:24:02 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-15 16:24:02 +0000 |
| commit | 95e87e71c58c496acb7a9d56ae707051d2bfb900 (patch) | |
| tree | 62345b018d527b6f215202e0fa57d56da97a038b | |
| parent | cdd8d2b163752d51399b1061e73871a72cc42714 (diff) | |
| download | nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar.gz nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar.bz2 nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar.lz nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar.xz nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.tar.zst nixpkgs-95e87e71c58c496acb7a9d56ae707051d2bfb900.zip | |
* Tribler: optionally support streaming playback of torrents via VLC.
svn path=/nixpkgs/trunk/; revision=32306
| -rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 8 |
1 files 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 = { |