From 13bd270b74e8aa03434be4a5d7f507c6dc5baf02 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 19 Oct 2022 12:46:44 +0200 Subject: [PATCH] libebml: 1.4.2 -> 1.4.4 --- .../development/libraries/libebml/default.nix | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix index 00fc506add7f..bded3d072353 100644 --- a/pkgs/development/libraries/libebml/default.nix +++ b/pkgs/development/libraries/libebml/default.nix @@ -1,31 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config }: +{ lib, stdenv, fetchFromGitHub, cmake, pkg-config }: stdenv.mkDerivation rec { pname = "libebml"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libebml"; rev = "release-${version}"; - sha256 = "1hiilnabar826lfxsaflqjhgsdli6hzzhjv8q2nmw36fvvlyks25"; + sha256 = "sha256-36SfZUHJ2sIvrrHox583cQqfWWcrL2zW1IHzgDchC9g="; }; - patches = [ - # Upstream fix for gcc-11 - (fetchpatch { - url = "https://github.com/Matroska-Org/libebml/commit/f0bfd53647961e799a43d918c46cf3b6bff89806.patch"; - sha256 = "1yd6rsds03kwx5jki4hihd2bpfh26g5l1pi82qzaqzarixdxwzvl"; - excludes = [ "ChangeLog" ]; - }) - # in master post 1.4.2, see https://github.com/Matroska-Org/libebml/issues/97 - (fetchpatch { - name = "fix-pkg-config.patch"; - url = "https://github.com/Matroska-Org/libebml/commit/42fbae35d291b737f2bb4ad5d643fd0d48537a88.patch"; - sha256 = "020qp4a3l60mcm4n310ynxbbv5qlpmybb9xy10pjvx4brp83pmy3"; - }) - ]; - nativeBuildInputs = [ cmake pkg-config ]; cmakeFlags = [