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

Merge pull request #27579 from jfrankenau/update-mpv

Browse Source 
mpv: 0.25.0 -> 0.26.0
This commit is contained in:
Jörg Thalheim 2017-07-23 10:15:06 +01:00 committed by GitHub
commit fb65f9cbc5
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,6 +33,7 @@
, vaapiSupport ? true, libva ? null , vaapiSupport ? true, libva ? null
, drmSupport ? !stdenv.isDarwin, libdrm ? null , drmSupport ? !stdenv.isDarwin, libdrm ? null
, vapoursynthSupport ? false, vapoursynth ? null , vapoursynthSupport ? false, vapoursynth ? null
, archiveSupport ? false, libarchive ? null
, jackaudioSupport ? false, libjack2 ? null , jackaudioSupport ? false, libjack2 ? null
# scripts you want to be loaded by default # scripts you want to be loaded by default
@ -65,6 +66,7 @@ assert libpngSupport -> available libpng;
assert youtubeSupport -> available youtube-dl; assert youtubeSupport -> available youtube-dl;
assert vapoursynthSupport -> available vapoursynth; assert vapoursynthSupport -> available vapoursynth;
assert jackaudioSupport -> available libjack2; assert jackaudioSupport -> available libjack2;
assert archiveSupport -> available libarchive;
assert vaapiSupport -> available libva; assert vaapiSupport -> available libva;
assert drmSupport -> available libdrm; assert drmSupport -> available libdrm;
@ -79,13 +81,13 @@ let
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "mpv-${version}"; name = "mpv-${version}";
version = "0.25.0"; version = "0.26.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mpv-player"; owner = "mpv-player";
repo = "mpv"; repo = "mpv";
rev = "v${version}"; rev = "v${version}";
sha256 = "16r3fyq472hzxnh6g3gm520pmw1ybslaki3pqjm2d9jnd2md1pa5"; sha256 = "0d9pvsknjqmxj907y85fxh9xcbb5dafw2bh7rpwhgs9x4wdrbvv0";
}; };
patchPhase = '' patchPhase = ''
@ -101,6 +103,9 @@ in stdenv.mkDerivation rec {
"--disable-libmpv-static" "--disable-libmpv-static"
"--disable-static-build" "--disable-static-build"
"--disable-build-date" # Purity "--disable-build-date" # Purity
(enableFeature archiveSupport "libarchive")
(enableFeature dvdreadSupport "dvdread")
(enableFeature dvdnavSupport "dvdnav")
(enableFeature vaapiSupport "vaapi") (enableFeature vaapiSupport "vaapi")
(enableFeature waylandSupport "wayland") (enableFeature waylandSupport "wayland")
]; ];
@ -136,6 +141,7 @@ in stdenv.mkDerivation rec {
++ optional vaapiSupport libva ++ optional vaapiSupport libva
++ optional drmSupport libdrm ++ optional drmSupport libdrm
++ optional vapoursynthSupport vapoursynth ++ optional vapoursynthSupport vapoursynth
++ optional archiveSupport libarchive
++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ]
++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ]
++ optionals waylandSupport [ wayland libxkbcommon ]; ++ optionals waylandSupport [ wayland libxkbcommon ];
@ -154,7 +160,7 @@ in stdenv.mkDerivation rec {
ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf ln -s ${freefont_ttf}/share/fonts/truetype/FreeSans.ttf $out/share/mpv/subfont.ttf
# Ensure youtube-dl is available in $PATH for MPV # Ensure youtube-dl is available in $PATH for MPV
wrapProgram $out/bin/mpv \ wrapProgram $out/bin/mpv \
--add-flags "--script=${concatStringsSep "," scripts}" \ --add-flags "--scripts=${concatStringsSep "," scripts}" \
'' + optionalString youtubeSupport '' '' + optionalString youtubeSupport ''
--prefix PATH : "${youtube-dl}/bin" \ --prefix PATH : "${youtube-dl}/bin" \
'' + optionalString vapoursynthSupport '' '' + optionalString vapoursynthSupport ''