mpv: update to stable version 0.3.7
Also: * minor waf update (reflecting bootstrap.py) * lua5_sockets inclusion (not detected yet)
This commit is contained in:
parent
cf53152902
commit
193dd39d8c
1 changed files with 8 additions and 6 deletions
|
@ -1,5 +1,5 @@
|
|||
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
|
||||
, lua5, perl, libpthreadstubs
|
||||
, lua5, lua5_sockets, perl, libpthreadstubs
|
||||
, python3, docutils, which
|
||||
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
|
||||
, xineramaSupport ? true, libXinerama ? null
|
||||
|
@ -42,14 +42,15 @@ assert libpngSupport -> libpng != null;
|
|||
assert quviSupport -> libquvi != null;
|
||||
assert cacaSupport -> libcaca != null;
|
||||
|
||||
# Purity problem: Waf needed to be is downloaded by bootstrap.py
|
||||
# Purity problem: Waf needed to be is downloaded by bootstrap.py,
|
||||
# but by purity reasons it should be avoided; thanks the-kenny to point it out!
|
||||
# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour
|
||||
# Now, it will just download and package Waf, mimetizing bootstrap.py behaviour;
|
||||
# An obvious problem is to update that stuff everytime mpv is updated
|
||||
|
||||
let
|
||||
waf = fetchurl {
|
||||
url = https://waf.googlecode.com/files/waf-1.7.13;
|
||||
sha256 = "03cc750049350ee01cdbc584b70924e333fcc17ba4a2d04648dab1535538a873";
|
||||
url = https://waf.googlecode.com/files/waf-1.7.15;
|
||||
sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
|
||||
};
|
||||
|
||||
version = "0.3.7";
|
||||
|
@ -65,7 +66,7 @@ stdenv.mkDerivation rec {
|
|||
};
|
||||
|
||||
buildInputs = with stdenv.lib;
|
||||
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs ]
|
||||
[ waf freetype pkgconfig ffmpeg libass docutils which libpthreadstubs lua5_sockets ]
|
||||
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
|
||||
++ optional alsaSupport alsaLib
|
||||
++ optional xvSupport libXv
|
||||
|
@ -128,5 +129,6 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# TODO: Wayland support
|
||||
# TODO: investigate libquvi support: it isn't detected by Waf script!
|
||||
# TODO: investigate lua sockets problem
|
||||
# TODO: investigate caca support: it isn't detected by Waf script!
|
||||
# TODO: a more systematic way to test this package
|
||||
|
|
Loading…
Reference in a new issue