diff options
| author | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
|---|---|---|
| committer | obadz <obadz-git@obadz.com> | 2016-08-27 23:54:54 +0100 |
| commit | 3de6e5be50124834f9d0adfc299295e9e6e30c08 (patch) | |
| tree | 31c4c7003ca554e75fa7ead8242f00922a92b25f /pkgs/applications/video | |
| parent | 132571454c8162cdefe9e94613137d6a13b950b7 (diff) | |
| parent | df27c35e9a0515146eb7db07e11af59e520214a6 (diff) | |
| download | nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.gz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.bz2 nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.lz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.xz nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.tar.zst nixlib-3de6e5be50124834f9d0adfc299295e9e6e30c08.zip | |
Merge branch 'master' into staging
Conflicts:
pkgs/applications/misc/navit/default.nix
pkgs/applications/networking/mailreaders/alpine/default.nix
pkgs/applications/networking/mailreaders/realpine/default.nix
pkgs/development/compilers/ghc/head.nix
pkgs/development/libraries/openssl/default.nix
pkgs/games/liquidwar/default.nix
pkgs/games/spring/springlobby.nix
pkgs/os-specific/linux/kernel/perf.nix
pkgs/servers/sip/freeswitch/default.nix
pkgs/tools/archivers/cromfs/default.nix
pkgs/tools/graphics/plotutils/default.nix
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 19 |
1 files 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 = '' |