diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-10 13:29:04 -0400 |
| commit | f40aa17933bc07d7913fd705b5f8ce50aab86782 (patch) | |
| tree | e34c79e6c3a09dc63011b44d877345f1a6b3bc78 /pkgs/development/libraries/ffmpeg | |
| parent | d1c4260859efeef4347d007ef8ce9bea5703cd0f (diff) | |
| parent | 4ae207aea0164caee9c39b24177692ab4ef4dab4 (diff) | |
| download | nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.gz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.bz2 nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.lz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.xz nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.tar.zst nixlib-f40aa17933bc07d7913fd705b5f8ce50aab86782.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix new file mode 100644 index 000000000000..a6e67052cd03 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -0,0 +1,12 @@ +{ stdenv, callPackage, fetchpatch +# Darwin frameworks +, Cocoa, CoreMedia +, ... +}@args: + +callPackage ./generic.nix (args // rec { + version = "${branch}"; + branch = "4.0"; + sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii"; + darwinFrameworks = [ Cocoa CoreMedia ]; +}) diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index e807a5148901..270e96055822 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation rec { "--enable-ffmpeg" "--disable-ffplay" (ifMinVer "0.6" "--enable-ffprobe") - "--disable-ffserver" + (if reqMin "4" then null else "--disable-ffserver") # Libraries (ifMinVer "0.6" "--enable-avcodec") (ifMinVer "0.6" "--enable-avdevice") |