From cccf8b3658056ff8b221b4f5a2843f6780be16b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 14 Jan 2024 08:10:06 -0300 Subject: [PATCH] mpc-qt: 23.02 -> 23.12 --- pkgs/applications/video/mpc-qt/default.nix | 22 +++++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 8fdf58f1df60..9bb23b548e3f 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,39 +1,47 @@ { lib , stdenv -, mkDerivation , fetchFromGitHub , pkg-config , qmake -, qtx11extras , qttools +, qtbase , mpv +, wrapQtAppsHook , gitUpdater }: -mkDerivation rec { +stdenv.mkDerivation rec { pname = "mpc-qt"; - version = "23.02"; + version = "23.12"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; rev = "v${version}"; - sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk="; + hash = "sha256-v22o5QtCY9Z8bPoIkwypG0oTBEPqPFeKZ8cWO+pKCD0="; }; nativeBuildInputs = [ pkg-config qmake qttools + wrapQtAppsHook ]; buildInputs = [ mpv - qtx11extras ]; + postPatch = '' + substituteInPlace lconvert.pri --replace "qtPrepareTool(LCONVERT, lconvert)" "qtPrepareTool(LCONVERT, lconvert, , , ${qttools}/bin)" + ''; + + postConfigure = '' + substituteInPlace Makefile --replace ${qtbase}/bin/lrelease ${qttools.dev}/bin/lrelease + ''; + qmakeFlags = [ - "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" + "MPCQT_VERSION=${version}" ]; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d416e506d603..85ffd0354468 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33873,7 +33873,7 @@ with pkgs; mm-common = callPackage ../development/libraries/mm-common { }; - mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mpc-qt = qt6Packages.callPackage ../applications/video/mpc-qt { }; mplayer = callPackage ../applications/video/mplayer ({ libdvdnav = libdvdnav_4_2_1;