mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 05:37:27 +03:00
Merge pull request #316998 from jopejoe1/ffmpeg/update/7.0.1
ffmpeg_7: 7.0 -> 7.0.1
This commit is contained in:
commit
0c11f909d7
@ -106,12 +106,10 @@ let
|
||||
# base ffmpeg version is specified in:
|
||||
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
||||
ffmpeg-version = "7.0";
|
||||
ffmpeg-hb = ffmpeg_7-full.overrideAttrs (old: {
|
||||
ffmpeg-hb = (ffmpeg_7-full.override {
|
||||
version = ffmpeg-version;
|
||||
src = fetchurl {
|
||||
url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2";
|
||||
hash = "sha256-ok2QdL9VI6Zaqp570Cr+QQnOedab130QT+09q0uTTXo=";
|
||||
};
|
||||
hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM=";
|
||||
}).overrideAttrs (old: {
|
||||
patches = (old.patches or [ ]) ++ [
|
||||
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
||||
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
||||
|
@ -32,8 +32,8 @@ let
|
||||
};
|
||||
|
||||
v7 = {
|
||||
version = "7.0";
|
||||
hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM=";
|
||||
version = "7.0.1";
|
||||
hash = "sha256-HiCT6bvLx4zmJ6ffutoimdz5ENQ55CRF64WBT3HeXMA=";
|
||||
};
|
||||
in
|
||||
|
||||
|
@ -465,7 +465,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
|
||||
}
|
||||
])
|
||||
++ (lib.optionals (lib.versionAtLeast version "7.0") [
|
||||
++ (lib.optionals (lib.versionAtLeast version "7.0" && lib.versionOlder version "7.0.1") [
|
||||
{
|
||||
# Will likely be obsolete in >7.0
|
||||
name = "fate_avoid_dependency_on_samples";
|
||||
|
Loading…
Reference in New Issue
Block a user