diff options
| author | Stefan Götz <stefan.goetz@uni-ulm.de> | 2017-01-10 22:42:29 +0100 |
|---|---|---|
| committer | Stefan Götz <stefan.goetz@uni-ulm.de> | 2017-01-10 22:42:29 +0100 |
| commit | 9280174493a8f9ef72e6c3345629e8ef2a0b990c (patch) | |
| tree | a27cb5bc76c6b0edc586c88efd8d9a2e933a9507 /pkgs | |
| parent | e9d3862b315897b4a124e096ab6fa0d6d0f730da (diff) | |
| download | nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar.gz nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar.bz2 nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar.lz nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar.xz nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.tar.zst nixlib-9280174493a8f9ef72e6c3345629e8ef2a0b990c.zip | |
mpv: 0.22.0 -> 0.23.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/video/mpv/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.2.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 20 insertions, 4 deletions
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index dd9c67b952f5..960dabd75695 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper -, docutils, perl, pkgconfig, python3, which, ffmpeg +, docutils, perl, pkgconfig, python3, which, ffmpeg_3_2 , freefont_ttf, freetype, libass, libpthreadstubs , lua, lua5_sockets, libuchardet, libiconv ? null, darwin @@ -79,13 +79,13 @@ let }; in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; rev = "v${version}"; - sha256 = "0mv8fs2zxp6pvpi5xdrpvvqcaa5f0c83jdfi0pfqnwbpkz1kb9s6"; + sha256 = "02k8p4z1mwxxlg9spwwrlcciia80kyrpp09hpl60g22h85jj1ng9"; }; patchPhase = '' @@ -112,7 +112,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ docutils makeWrapper perl pkgconfig python3 which ]; buildInputs = [ - ffmpeg freetype libass libpthreadstubs + ffmpeg_3_2 freetype libass libpthreadstubs lua lua5_sockets libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv diff --git a/pkgs/development/libraries/ffmpeg/3.2.nix b/pkgs/development/libraries/ffmpeg/3.2.nix new file mode 100644 index 000000000000..7587ca7c3cac --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/3.2.nix @@ -0,0 +1,13 @@ +{ stdenv, callPackage +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.2"; + branch = "3.2"; + sha256 = "0srn788i4k5827sl8vmds6133vjy9ygsmgzwn40n3l5qs5b9l4hb"; + darwinFrameworks = [ Cocoa CoreMedia ]; + patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1337a74d11aa..adc434f97d7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7091,6 +7091,9 @@ in ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; |