diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-04-10 08:30:54 +0000 |
|---|---|---|
| committer | TredwellGit <tredwell@tutanota.com> | 2021-04-10 08:30:54 +0000 |
| commit | 72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5 (patch) | |
| tree | f2bc7672c0a8381ed90073ab49f686e85cc01ddb /pkgs/development/libraries/ffmpeg | |
| parent | 66d1da7e0068d19b3db47df463a2ea6c78552e1b (diff) | |
| download | nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar.gz nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar.bz2 nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar.lz nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar.xz nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.tar.zst nixpkgs-72354f8ec17b76e70faf2f6b1f1e7ae9a3b9e3c5.zip | |
ffmpeg: 4.3.2 -> 4.4
https://github.com/FFmpeg/FFmpeg/blob/n4.4/Changelog
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 3 |
3 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index be341d588c1..a5140fa01ca 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchpatch +{ callPackage # Darwin frameworks , Cocoa, CoreMedia , ... diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 95207b5386f..c765cdf73c5 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -1,12 +1,12 @@ -{ callPackage, fetchpatch +{ callPackage # Darwin frameworks , Cocoa, CoreMedia, VideoToolbox , ... }@args: callPackage ./generic.nix (rec { - version = "4.3.2"; - branch = "4.3"; - sha256 = "0flik4y7c5kchj65p3p908mk1dsncqgzjdvzysjs12rmf1m6sfmb"; + version = "4.4"; + branch = "4.4"; + sha256 = "03kxc29y8190k4y8s8qdpsghlbpmchv1m8iqygq2qn0vfm4ka2a2"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; } // args) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 82f1a8bf564..befdb910210 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -213,7 +213,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A complete, cross-platform solution to record, convert and stream audio and video"; - homepage = "http://www.ffmpeg.org/"; + homepage = "https://www.ffmpeg.org/"; + changelog = "https://github.com/FFmpeg/FFmpeg/blob/n${version}/Changelog"; longDescription = '' FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines |