public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mpv: minor updates and cleanup

Browse Source 
E.g. parameterize lua.
This commit is contained in:
AndersonTorres 2014-04-19 15:16:00 -03:00 committed by Bjørn Forsman
parent 193dd39d8c
commit 31a94915d2
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{ stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass
, lua5, lua5_sockets, perl, libpthreadstubs , lua, perl, libpthreadstubs
, lua5_sockets
, python3, docutils, which , python3, docutils, which
, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null
, xineramaSupport ? true, libXinerama ? null , xineramaSupport ? true, libXinerama ? null
@ -42,10 +43,9 @@ assert libpngSupport -> libpng != null;
assert quviSupport -> libquvi != null; assert quviSupport -> libquvi != null;
assert cacaSupport -> libcaca != 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! # 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 let
waf = fetchurl { waf = fetchurl {
@ -53,12 +53,11 @@ let
sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6"; sha256 = "e5ae7028f9b2d8ce1acb9fe1092e8010a90ba764d3ac065ea4e846743290b1d6";
}; };
version = "0.3.7";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "mpv-${version}"; name = "mpv-${version}";
version = "0.3.7";
src = fetchurl { src = fetchurl {
url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
@ -87,7 +86,7 @@ stdenv.mkDerivation rec {
++ optional cacaSupport libcaca ++ optional cacaSupport libcaca
; ;
nativeBuildInputs = [ python3 lua5 perl ]; nativeBuildInputs = [ python3 lua perl ];
# There are almost no need of "configure flags", but some libraries # There are almost no need of "configure flags", but some libraries
@ -128,7 +127,6 @@ stdenv.mkDerivation rec {
# Heavily based on mplayer2 expression # Heavily based on mplayer2 expression
# TODO: Wayland support # TODO: Wayland support
# TODO: investigate libquvi support: it isn't detected by Waf script! # TODO: investigate libquvi support
# TODO: investigate lua sockets problem # TODO: investigate caca support
# TODO: investigate caca support: it isn't detected by Waf script! # TODO: investigate lua5_sockets bug
# TODO: a more systematic way to test this package

1
pkgs/top-level/all-packages.nix
View File

@ -8713,6 +8713,7 @@ let
}; };
mpv = callPackage ../applications/video/mpv { mpv = callPackage ../applications/video/mpv {
lua = lua5_1;
bs2bSupport = true; bs2bSupport = true;
quviSupport = true; quviSupport = true;
cacaSupport = true; cacaSupport = true;