diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2017-04-22 18:48:06 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2017-04-30 16:52:48 -0700 |
| commit | 7172556e8d0362901db5c0bf1ff7f86e2251cc95 (patch) | |
| tree | 46ef052ad72ac7907ae9276eb5c10bfdc1410aee | |
| parent | 5a9850cedd7a4642629b541fe03c4816ffceff64 (diff) | |
| download | nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar.gz nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar.bz2 nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar.lz nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar.xz nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.tar.zst nixlib-7172556e8d0362901db5c0bf1ff7f86e2251cc95.zip | |
ffmpeg: 3.2.4 -> 3.3
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/3.3.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/3.3.nix b/pkgs/development/libraries/ffmpeg/3.3.nix new file mode 100644 index 000000000000..c3aa8de4e1e6 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/3.3.nix @@ -0,0 +1,13 @@ +{ stdenv, callPackage +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}"; + branch = "3.3"; + sha256 = "1p3brx0qa3i3569zlmcmpbxf17q73nrmbx2vp39s8h77r53qdq11"; + 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 c28142c9af43..85b835dd1ca5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7467,11 +7467,14 @@ with pkgs; ffmpeg_3_2 = callPackage ../development/libraries/ffmpeg/3.2.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_2; + ffmpeg_3 = ffmpeg_3_3; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { |