diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-16 15:02:26 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-16 15:02:26 +0000 |
| commit | e5027e5b365a91a7094ebae7875da6e6d31c211f (patch) | |
| tree | b45d1a912c85b66f6e9288145de64db5fa1e7b62 /pkgs/applications/networking/p2p | |
| parent | ebdb515865ec152c77bc58f4f568aa39bb38cff0 (diff) | |
| parent | 82aab32119e54fbc0c1d2eae30af58ce4e30cf7b (diff) | |
| download | nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.gz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.bz2 nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.lz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.xz nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.tar.zst nixlib-e5027e5b365a91a7094ebae7875da6e6d31c211f.zip | |
svn merge ^/nixpkgs/trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=32330
Diffstat (limited to 'pkgs/applications/networking/p2p')
| -rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index abb4eff6b57f..4e02eb9f1e6a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools }: +{ stdenv, fetchsvn, pythonPackages, makeWrapper, nettools +, enablePlayer ? false, vlc ? null }: -let rev = "24763"; in +let rev = "24912"; in stdenv.mkDerivation { - name = "tribler-5.5.10"; + name = "tribler-5.5.13-pre${rev}"; src = fetchsvn { url = http://svn.tribler.org/abc/branches/release-5.5.x; inherit rev; - sha256 = "1lvg2vvwzwf8zzg0fl1mp8wc0kcspxkl84q4qdxalkv4x2d8w5c6"; + sha256 = "1x4rf83gsxif7fwx7p4crfji52i5y8rp54qfv1lbyxr8dfqjx83g"; }; buildInputs = [ pythonPackages.python pythonPackages.wrapPython makeWrapper ]; @@ -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 = { |