minitube: 3.9.3 -> 4.0, build with Qt6

pkgs/applications/video/minitube/default.nix

@@ -5,11 +5,8 @@
   qmake,
   qttools,
   wrapQtAppsHook,
-  phonon,
-  phonon-backend-vlc,
   qtbase,
   qtdeclarative,
-  qtx11extras,
   mpv,
 
   # "Free" key generated by pasqui23
@@ -18,21 +15,21 @@
 
 stdenv.mkDerivation rec {
   pname = "minitube";
-  version = "3.9.3";
+  version = "4.0";
 
   src = fetchFromGitHub {
-    hash = "sha256-ROqROQsV8ddrxYT5mMdkf6rCgCoGr1jpxQ1ohcoEaQs=";
-    rev = version;
     repo = "minitube";
     owner = "flaviotordini";
+    tag = version;
     fetchSubmodules = true;
+    hash = "sha256-JAxdPiiPDpmhJBiNtlaMbdcC/YEGJyc9mP3kBvee/74=";
   };
 
-  patches = [
-    # Taken from FreeBSD; already merged upstream in the media submodule
-    # (https://github.com/flaviotordini/media/commit/f6b7020f273e1fc06e6e204fab37a7c8edaa857a)
-    ./lib_media_src_mpv_mpvwidget.patch
-  ];
+  # https://github.com/NixOS/nixpkgs/issues/214765
+  postPatch = ''
+    substituteInPlace locale/locale.pri \
+      --replace-fail '$$[QT_INSTALL_BINS]/lrelease' '${lib.getDev qttools}/bin/lrelease'
+  '';
 
   nativeBuildInputs = [
     qmake
@@ -41,11 +38,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    phonon
-    phonon-backend-vlc
     qtbase
     qtdeclarative
-    qtx11extras
     mpv
   ];
 

pkgs/applications/video/minitube/lib_media_src_mpv_mpvwidget.patch

@@ -1,16 +0,0 @@
-diff -Nur a/lib/media/src/mpv/mpvwidget.cpp b/lib/media/src/mpv/mpvwidget.cpp
---- a/lib/media/src/mpv/mpvwidget.cpp
-+++ b/lib/media/src/mpv/mpvwidget.cpp
-@@ -30,7 +30,11 @@
-     qDebug() << "initializeGL" << nativeParent;
-     if (nativeParent == nullptr) qFatal("No native parent");
- 
--    mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr};
-+    #if MPV_CLIENT_API_VERSION < MPV_MAKE_VERSION(2,0)
-+	mpv_opengl_init_params gl_init_params{get_proc_address, this, nullptr};
-+    #else
-+	mpv_opengl_init_params gl_init_params{get_proc_address, this};
-+    #endif
-     mpv_render_param params[]{{MPV_RENDER_PARAM_API_TYPE, (void *)MPV_RENDER_API_TYPE_OPENGL},
-                               {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &gl_init_params},
-                               {MPV_RENDER_PARAM_INVALID, nullptr},

pkgs/top-level/all-packages.nix

@@ -9795,7 +9795,7 @@ with pkgs;
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };
 
-  minitube = libsForQt5.callPackage ../applications/video/minitube { };
+  minitube = kdePackages.callPackage ../applications/video/minitube { };
 
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;