diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index 73fab758d75e..9bb23b548e3f 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,21 +1,50 @@ -{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake, qtx11extras, qttools, mpv }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, qmake +, 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 ]; + nativeBuildInputs = [ + pkg-config + qmake + qttools + wrapQtAppsHook + ]; - buildInputs = [ mpv qtx11extras ]; + buildInputs = [ + mpv + ]; - qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; + 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 = [ + "MPCQT_VERSION=${version}" + ]; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = with lib; { description = "Media Player Classic Qute Theater"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9c56dd1a58aa..79239e00c3e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33882,7 +33882,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;