diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-05-10 17:44:40 +0300 |
|---|---|---|
| committer | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-05-10 17:44:40 +0300 |
| commit | 956d174c8da0195dd99805c6962165cff6c1f871 (patch) | |
| tree | 4a4cc93b62248cef381b050a9eb35e95bc378b6b | |
| parent | 6cc732ebbee991cdaf35063574a664d9adcd0950 (diff) | |
| download | nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar.gz nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar.bz2 nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar.lz nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar.xz nixlib-956d174c8da0195dd99805c6962165cff6c1f871.tar.zst nixlib-956d174c8da0195dd99805c6962165cff6c1f871.zip | |
ffmpeg_4: init
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/generic.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 17 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 4a05eab87bd7..b27db14528ca 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") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4d1ed8d89a1..7856fe4b387e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8818,6 +8818,10 @@ with pkgs; ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; + ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix { + inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; + }; + # Aliases ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; |