From 4f91c270d215154dd4f97336a27e29d3e75db30d Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 25 Aug 2016 00:47:13 +0200 Subject: [PATCH] mpv: 0.18.1 -> 0.19.0 --- pkgs/applications/video/mpv/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 23f6daf0d61a..7eea4dc2d697 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchurl, docutils, makeWrapper, perl, pkgconfig, python, which -, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs, lua, lua5_sockets +{ stdenv, fetchurl, fetchFromGitHub, docutils, makeWrapper, perl, pkgconfig +, python, which, ffmpeg, freefont_ttf, freetype, libass, libpthreadstubs +, lua, lua5_sockets , libuchardet, rubberband , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null @@ -54,19 +55,21 @@ let # for purity reasons this behavior should be avoided. wafVersion = "1.8.12"; waf = fetchurl { - urls = [ "http://ftp.waf.io/pub/release/waf-${wafVersion}" - "http://waf.io/waf-${wafVersion}" ]; + urls = [ "http://waf.io/waf-${wafVersion}" + "http://www.freehackers.org/~tnagy/release/waf-${wafVersion}" ]; sha256 = "12y9c352zwliw0zk9jm2lhynsjcf5jy0k1qch1c1av8hnbm2pgq1"; }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.18.1"; + version = "0.19.0"; - src = fetchurl { - url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0ab3lkvx1j06x7qlp9m4r4zk28dr7z8ki3w4kfgkpm2axizxa4z4"; + src = fetchFromGitHub { + owner = "mpv-player"; + repo = "mpv"; + rev = "v${version}"; + sha256 = "14rbglrcplhkf16ik4fbcv7k27lz6h4glfayr12ylh98srmsscqa"; }; patchPhase = ''