diff options
| author | Thomas Tuegel <thomas.tuegel@runtimeverification.com> | 2020-09-25 10:53:34 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2020-09-26 05:50:25 -0500 |
| commit | c70831a9fb5f686e36c40664da03b5e10f7e7167 (patch) | |
| tree | be02d540575688d88512d6aa8b6c49d5ec41f251 /pkgs/applications/networking/p2p/tribler | |
| parent | b3ab15a05793515f3b50205204c74082b98254df (diff) | |
tribler: use libvlc
Diffstat (limited to 'pkgs/applications/networking/p2p/tribler')
| -rw-r--r-- | pkgs/applications/networking/p2p/tribler/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index ed1129b238ac0..5cab23ecd710c 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgs, python3Packages, makeWrapper -, enablePlayer ? true, vlc ? null, qt5, lib }: +, enablePlayer ? true, libvlc ? null, qt5, lib }: stdenv.mkDerivation rec { pname = "tribler"; @@ -50,9 +50,9 @@ stdenv.mkDerivation rec { postPatch = '' ${stdenv.lib.optionalString enablePlayer '' - substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${vlc}/lib/libvlc.so')" + substituteInPlace "./TriblerGUI/vlc.py" --replace "ctypes.CDLL(p)" "ctypes.CDLL('${libvlc}/lib/libvlc.so')" substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "if vlc and vlc.plugin_path" "if vlc" - substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${vlc}/lib/vlc/plugins'" + substituteInPlace "./TriblerGUI/widgets/videoplayerpage.py" --replace "os.environ['VLC_PLUGIN_PATH'] = vlc.plugin_path" "os.environ['VLC_PLUGIN_PATH'] = '${libvlc}/lib/vlc/plugins'" ''} ''; @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { --run 'cd $_TRIBLERPATH' \ --add-flags "-O $out/run_tribler.py" \ ${stdenv.lib.optionalString enablePlayer '' - --prefix LD_LIBRARY_PATH : ${vlc}/lib + --prefix LD_LIBRARY_PATH : ${libvlc}/lib ''} mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 |