From a7a7e414f092e902eb822bde2438f07e6bc65667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Sun, 22 Dec 2013 19:00:05 +0100 Subject: [PATCH] Updating mpv, and making it use ffmpeg_2 --- pkgs/applications/video/mpv/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index bb91ca5beb5c..e382481b6f60 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -55,11 +55,12 @@ let in stdenv.mkDerivation rec { - name = "mpv-20130812"; + name = "mpv-20131222"; src = fetchgit { url = "https://github.com/mpv-player/mpv.git"; - rev = "62925a5c15a76568c155259bafa1361ec139c66b"; + rev = "e6bea0ec5a"; + sha256 = "984c7d19b1916b7e5befc370ffb7f6c31e560c64c47090b924a115d00c35a1a8"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2d9b9e9ce10..c1e9bf72ce9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8519,7 +8519,7 @@ let }; mpv = callPackage ../applications/video/mpv { - ffmpeg = ffmpeg_1; + ffmpeg = ffmpeg_2; bs2bSupport = true; quviSupport = true; cacaSupport = true;