From 7532dcd683dbdd0d1b32ff069a73bfe4b18c6e16 Mon Sep 17 00:00:00 2001 From: rewine <1758075541@qq.com> Date: Fri, 29 Apr 2022 17:57:05 +0800 Subject: [PATCH 1/2] libmediainfo: 21.09 -> 22.03 --- .../libraries/libmediainfo/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix index 2a74c79afaf..3a0ced3d980 100644 --- a/pkgs/development/libraries/libmediainfo/default.nix +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -1,23 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib, fetchpatch }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, zlib }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "libmediainfo"; src = fetchurl { url = "https://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz"; - sha256 = "09pinxqw3z3hxrafn67clw1cb1z9aqfy6gkiavginfm0yr299gk9"; + sha256 = "sha256-/FC6u2KOnPumVSiNrgbVw0Kw1+aUGjLWT7uxEySMgLk="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen zlib ]; - - patches = [ - # fixes pkgsMusl.libmediainfo build - (fetchpatch { - url = "https://git.alpinelinux.org/aports/plain/community/libmediainfo/fix-include-signal.patch?id=b8d666a3d33575c184308e1176f4de9e519af577"; - sha256 = "sha256-b3HoIwy/hKSh8jUakwVJpnPmYw5KUwZXgLW7IPMY4/c="; - }) - ]; + buildInputs = [ zlib ]; + propagatedBuildInputs = [ libzen ]; postPatch = "cd Project/GNU/Library"; From f7ad1883059b27ec9017438e81aa9ceca875b7a7 Mon Sep 17 00:00:00 2001 From: rewine <1758075541@qq.com> Date: Sat, 30 Apr 2022 00:12:04 +0800 Subject: [PATCH 2/2] mediainfo-gui: 21.09 -> 22.03 --- pkgs/applications/misc/mediainfo-gui/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index 0ce8d8c373d..fc2c2ad618d 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -1,17 +1,16 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libzen, libmediainfo, wxGTK30-gtk3 +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libmediainfo, wxGTK30-gtk3 , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "21.09"; + version = "22.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "0mqcqm8y2whnbdi2ry7jd755gfl5ccdqhwjh67hsyr7c0ajxk3vv"; + sha256 = "sha256-Yjb5Kh1XqBdLPzDqbd6Kq1ONj2IPcoIk2FE3MWmAK+Q="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; - buildInputs = [ libzen libmediainfo wxGTK30-gtk3 desktop-file-utils libSM - imagemagick ]; + buildInputs = [ libmediainfo wxGTK30-gtk3 desktop-file-utils libSM imagemagick ]; sourceRoot = "./MediaInfo/Project/GNU/GUI/";