Merge pull request #240279 from marsam/fix-mkvtoolnix-build

mkvtoolnix-cli: fix build
This commit is contained in:
Weijia Wang 2023-06-28 11:00:25 +03:00 committed by GitHub
commit 2b5b25c88e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitLab
, fetchpatch
, pkg-config
, autoreconfHook
, rake
@ -56,15 +55,6 @@ stdenv.mkDerivation rec {
sha256 = "t+kfFS5c8w+c9wxNh59nceFesfdMy8qvHlUqDbZAxkk=";
};
patches = [
# Fix compatiblity with fmt 10.0. Remove with the next release
(fetchpatch {
url = "https://gitlab.com/mbunkus/mkvtoolnix/-/commit/24716ce95bf5b10d685611de23489045cf2ca5cc.patch";
hash = "sha256-vOm3FmXL3mHzs3RHCJ9gbTLSe3xhSXo8IfgA+s0cFjY=";
includes = [ "src/common/codec.h" ];
})
];
nativeBuildInputs = [
autoreconfHook
docbook_xsl