From a8a4e0e83b48a1d93ce35c36362c6eced77d3dca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 14 Jan 2024 08:05:58 -0300
Subject: [PATCH 1/3] mpc-qt: reformat

---
 pkgs/applications/video/mpc-qt/default.nix | 26 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index 73fab758d75e..c9ac696e1971 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, pkg-config, qmake, qtx11extras, qttools, mpv }:
+{ lib
+, stdenv
+, mkDerivation
+, fetchFromGitHub
+, pkg-config
+, qmake
+, qtx11extras
+, qttools
+, mpv
+}:
 
 mkDerivation rec {
   pname = "mpc-qt";
@@ -11,11 +20,20 @@ mkDerivation rec {
     sha256 = "sha256-b8efsdWWpwoaiX+oQhHK15KxD6JpvPhESTxCR2kS7Mk=";
   };
 
-  nativeBuildInputs = [ pkg-config qmake qttools ];
+  nativeBuildInputs = [
+    pkg-config
+    qmake
+    qttools
+  ];
 
-  buildInputs = [ mpv qtx11extras ];
+  buildInputs = [
+    mpv
+    qtx11extras
+  ];
 
-  qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ];
+  qmakeFlags = [
+    "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
+  ];
 
   meta = with lib; {
     description = "Media Player Classic Qute Theater";

From 95f0a9ed4c5a7cb4581c9efa16a5097be72b212b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 14 Jan 2024 08:08:42 -0300
Subject: [PATCH 2/3] mpc-qt: add update script

---
 pkgs/applications/video/mpc-qt/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix
index c9ac696e1971..8fdf58f1df60 100644
--- a/pkgs/applications/video/mpc-qt/default.nix
+++ b/pkgs/applications/video/mpc-qt/default.nix
@@ -7,6 +7,7 @@
 , qtx11extras
 , qttools
 , mpv
+, gitUpdater
 }:
 
 mkDerivation rec {
@@ -35,6 +36,8 @@ mkDerivation rec {
     "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate"
   ];
 
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
   meta = with lib; {
     description = "Media Player Classic Qute Theater";
     homepage = "https://mpc-qt.github.io";

From cccf8b3658056ff8b221b4f5a2843f6780be16b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sun, 14 Jan 2024 08:10:06 -0300
Subject: [PATCH 3/3] 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;