diff options
| author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-10 18:21:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 18:21:38 +0200 |
| commit | 1463480edbf6757140b3764dcec2fa720978add6 (patch) | |
| tree | e92eb103ed0722726c6386628fa2d64f4e60743c /pkgs/development/libraries/ffmpeg | |
| parent | 1d682d5314e7999a2a347fe66af5dca39166551c (diff) | |
| parent | d691c8170ae2a8ef73c40f6187e7181015f8cdca (diff) | |
| download | nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.gz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.bz2 nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.lz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.xz nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.zst nixlib-1463480edbf6757140b3764dcec2fa720978add6.zip | |
Merge pull request #40289 from yegortimoshenko/mpv-bump
mpv: 0.27.2 -> 0.28.2
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 530639d757de..c5de220eaad4 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -103,7 +103,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") |