From 360003df84a378f8569aa56f4877e2d7f161e60d Mon Sep 17 00:00:00 2001 From: Kylie McClain Date: Wed, 27 Aug 2025 21:58:08 -0400 Subject: [PATCH] tageditor: switch to using Qt6 --- pkgs/by-name/ta/tageditor/package.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix index de03722f3c4e..e781976b018d 100644 --- a/pkgs/by-name/ta/tageditor/package.nix +++ b/pkgs/by-name/ta/tageditor/package.nix @@ -7,8 +7,8 @@ cpp-utilities, mp4v2, libid3tag, - libsForQt5, - qt5, + kdePackages, + qt6, tagparser, }: @@ -26,21 +26,26 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - qt5.wrapQtAppsHook + qt6.wrapQtAppsHook ]; buildInputs = [ mp4v2 libid3tag - qt5.qtbase - qt5.qttools - qt5.qtx11extras - qt5.qtwebengine cpp-utilities - libsForQt5.qtutilities + kdePackages.qtutilities + qt6.qtbase + qt6.qttools + qt6.qtwebengine tagparser ]; + cmakeFlags = [ + "-DQT_PACKAGE_PREFIX=Qt6" + "-DQt6_DIR=${qt6.qtbase}/lib/cmake/Qt6" + "-DQt6WebEngineWidgets_DIR=${qt6.qtwebengine}/lib/cmake/Qt6WebEngineWidgets" + ]; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/Applications mv $out/bin/*.app $out/Applications