dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

mpv: update to 0.5.4

Browse Source 
Also, a small update on internal let-waf expression

Closes #4306
This commit is contained in:
AndersonTorres 2014-09-27 17:18:42 -03:00 committed by Mateusz Kowalczyk
parent 0a6bfe69e5
commit 9a6e559b9d
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/video/mpv/default.nix
View File

@ -22,7 +22,8 @@
# for Youtube support
, quviSupport ? false, libquvi ? null
, cacaSupport ? false, libcaca ? null
, vaapiSupport ? false, libva ? null }:
, vaapiSupport ? false, libva ? null
}:
assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
assert xineramaSupport -> (libXinerama != null && x11Support);
@ -49,23 +50,23 @@ assert cacaSupport -> libcaca != null;
let
waf = fetchurl {
url = https://waf.googlecode.com/files/waf-1.7.15;
sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
url = http://ftp.waf.io/pub/release/waf-1.7.16;
sha256 = "b64dc26c882572415fd450b745006107965f3fe17b357e3eb43d6676c9635a61";
};
in
stdenv.mkDerivation rec {
name = "mpv-${version}";
version = "0.5.0";
version = "0.5.4";
src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
sha256 = "17mmc6xm8yir2p379h00q3wy7rplz2s31h6sxswmzbh72xf10g96";
sha256 = "1n992nvylnh27jc6425daasq0nsxjfc1mxhhlhvlwzxm724x94xp";
};
buildInputs = with stdenv.lib;
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
[ waf python3 lua perl freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optional alsaSupport alsaLib
++ optional xvSupport libXv
@ -87,9 +88,6 @@ stdenv.mkDerivation rec {
++ optional vaapiSupport libva
;
nativeBuildInputs = [ python3 lua perl ];
# There are almost no need of "configure flags", but some libraries
# weren't detected; see the TODO comments below
@ -127,8 +125,6 @@ stdenv.mkDerivation rec {
};
}
# Many thanks @matejc for this update: 0.5.0 and vaapi (experimental)
# TODO: Wayland support
# TODO: investigate libquvi problems (related to Youtube support)
# TODO: investigate caca support