mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-23 13:48:21 +03:00
handbrake: use ffmpeg's new override interface
ffmpeg no longer responds to changing version using overrideAttrs. This causes an issue where a critical patch that is included when ABI == 7.0 would not be applied because the ffmpeg drv still thinks it's building for ABI 7.0.1. You must specify the ABI version via the explicit override API now which this patch does. The ffmpeg derivation now supports fetching an upstream source for a certain version; there is no need to do so manually anymore.
This commit is contained in:
parent
00d7d60e2a
commit
0093d837d9
@ -106,12 +106,10 @@ let
|
|||||||
# base ffmpeg version is specified in:
|
# base ffmpeg version is specified in:
|
||||||
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
# https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs
|
||||||
ffmpeg-version = "7.0";
|
ffmpeg-version = "7.0";
|
||||||
ffmpeg-hb = ffmpeg_7-full.overrideAttrs (old: {
|
ffmpeg-hb = (ffmpeg_7-full.override {
|
||||||
version = ffmpeg-version;
|
version = ffmpeg-version;
|
||||||
src = fetchurl {
|
hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM=";
|
||||||
url = "https://www.ffmpeg.org/releases/ffmpeg-${ffmpeg-version}.tar.bz2";
|
}).overrideAttrs (old: {
|
||||||
hash = "sha256-ok2QdL9VI6Zaqp570Cr+QQnOedab130QT+09q0uTTXo=";
|
|
||||||
};
|
|
||||||
patches = (old.patches or [ ]) ++ [
|
patches = (old.patches or [ ]) ++ [
|
||||||
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
"${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch"
|
||||||
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
"${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch"
|
||||||
|
Loading…
Reference in New Issue
Block a user