From 193dd39d8c7bcb2ec2c36e198e8253324a475b92 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 6 Apr 2014 21:20:13 -0300 Subject: [PATCH] mpv: update to stable version 0.3.7 Also: * minor waf update (reflecting bootstrap.py) * lua5_sockets inclusion (not detected yet) --- pkgs/applications/video/mpv/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index b37a8a876302..f7c4218d0ffc 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -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