Merge pull request #138735 from trofi/fix-libebml-for-gcc-11

libebml: upstream fix for gcc-11
2021-09-21 00:53:21 +02:00
parent f769b2a168 8fc20dfdca
commit 3fffe2d33c
1 changed files with 10 additions and 1 deletions
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }:

 stdenv.mkDerivation rec {
  pname = "libebml";
@@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
    sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25";
  };

+  patches = [
+    # Upstream fix for gcc-11
+    (fetchpatch {
+      url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch";
+      sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl";
+      excludes = [ "ChangeLog" ];
+    })
+  ];
+
  nativeBuildInputs = [ cmake pkg-config ];

  cmakeFlags = [