diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-20 10:01:49 +0100 |
| commit | 65edeb8633de16792a84195f77a6b4ea408e2608 (patch) | |
| tree | be3960fdb869c4d25b8128fb1080810e6ea22756 /pkgs/development/libraries/ffmpeg | |
| parent | 13bab298fc1ad49db5449b262125d25d849bc90e (diff) | |
| parent | 648152fdbbdbb8a51335b94647ea9f959f42064d (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.8.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 5ffbc215d8b38..98ada9a3f09f0 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (rec { version = "${branch}.14"; branch = "2.8"; sha256 = "1g6x3lyjl1zlfksizj1ys61kj97yg0xf4dlr6sr5acpbja3a26yn"; -}) +} // args) diff --git a/pkgs/development/libraries/ffmpeg/3.4.nix b/pkgs/development/libraries/ffmpeg/3.4.nix index bea367b2554e3..759fba65587f6 100644 --- a/pkgs/development/libraries/ffmpeg/3.4.nix +++ b/pkgs/development/libraries/ffmpeg/3.4.nix @@ -4,9 +4,9 @@ , ... }@args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (rec { version = branch; branch = "3.4.6"; sha256 = "1s20wzgxxrm56gckyb8cf1lh36hdnkdxvmmnnvdxvia4zb3grf1b"; darwinFrameworks = [ Cocoa CoreMedia ]; -}) +} // args) diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index a0b95cecaaba1..387069d16189c 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -4,9 +4,9 @@ , ... }@args: -callPackage ./generic.nix (args // rec { +callPackage ./generic.nix (rec { version = "4.2.1"; branch = "4.2"; sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; -}) +} // args) |