From 3f642b4d62289b88c091f5b3a837c4b8dd568d01 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 11 Jan 2018 22:47:24 +0100 Subject: [PATCH 1/3] zimg: 2.6.1 -> 2.7 --- pkgs/development/libraries/zimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zimg/default.nix b/pkgs/development/libraries/zimg/default.nix index b5bb73e3e33..00973350e18 100644 --- a/pkgs/development/libraries/zimg/default.nix +++ b/pkgs/development/libraries/zimg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec{ name = "zimg-${version}"; - version = "2.6.1"; + version = "2.7"; src = fetchFromGitHub { owner = "sekrit-twc"; repo = "zimg"; rev = "release-${version}"; - sha256 = "08hynzcxz95a4i67k5cn6isafdb6xjgd0x0miyhlnp2xc220zfqj"; + sha256 = "1jvx3a523mzkc54rrjab9kz66kc6q1snry9ymwmsx7rrd3kv3j6m"; }; nativeBuildInputs = [ autoreconfHook ]; From c1902ef000b4ac447dc89099494dbfe5459407f1 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 11 Jan 2018 22:47:52 +0100 Subject: [PATCH 2/3] vapoursynth: R39 -> R40 --- pkgs/development/libraries/vapoursynth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 6864db12f18..24c4a50d874 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -12,13 +12,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "vapoursynth-${version}"; - version = "R39"; + version = "R40"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "0cw7w8xiwhxhwykydy13m44wm9vn9hrsi30z6017ngga9d84fhqy"; + sha256 = "1ycc3fdhhryp7hap80z3qmh89br31kcswzp8ai3wlc07zfvcrfck"; }; nativeBuildInputs = [ pkgconfig autoreconfHook nasm ]; From e5aae0f2d6d7f46e4ed3689790aa7a7541deae82 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 13 Jan 2018 02:02:44 +0100 Subject: [PATCH 3/3] mpv: fix PYTHONPATH --- pkgs/applications/video/mpv/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 7aaa1b65fc4..dcbafd8594d 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -172,7 +172,7 @@ in stdenv.mkDerivation rec { '' + optionalString youtubeSupport '' --prefix PATH : "${youtube-dl}/bin" \ '' + optionalString vapoursynthSupport '' - --prefix PYTHONPATH : "$(toPythonPath ${vapoursynth}):$PYTHONPATH" + --prefix PYTHONPATH : "${vapoursynth}/lib/${python3.libPrefix}/site-packages:$PYTHONPATH" '' + '' cp TOOLS/umpv $out/bin