various: move qt6 applications to by-name, part 2

pkgs/applications/office/beamerpresenter/default.nix → pkgs/by-name/be/beamerpresenter/package.nix

@@ -5,16 +5,10 @@
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  wrapQtAppsHook,
   gst_all_1,
-  qtbase,
-  qtsvg,
-  qtmultimedia,
-  qttools,
-  qtwayland,
   zlib,
-  # only required when using poppler
-  poppler,
+  qt6,
+  qt6Packages,
   # only required when using mupdf
   freetype,
   gumbo,
@@ -27,22 +21,22 @@
   useExternalRenderer ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "beamerpresenter";
   version = "0.2.6";
 
   src = fetchFromGitHub {
     owner = "beamerpresenter";
     repo = "BeamerPresenter";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-sPeWlPkWOPfLAoAC/+T7nyhPqvoaZg6aMOIVLjMqd2k=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
     wrapGAppsHook3
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   dontWrapGApps = true;
@@ -52,13 +46,13 @@ stdenv.mkDerivation rec {
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good
     zlib
-    qtbase
-    qtsvg
-    qtmultimedia
-    qttools
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtmultimedia
+    qt6.qttools
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ]
   ++ lib.optionals useMupdf [
     freetype
@@ -68,7 +62,7 @@ stdenv.mkDerivation rec {
     openjpeg
   ]
   ++ lib.optionals usePoppler [
-    poppler
+    qt6Packages.poppler
   ];
 
   cmakeFlags = [
@@ -81,7 +75,7 @@ stdenv.mkDerivation rec {
     "-DLINK_MUJS=OFF"
     "-DLINK_GUMBO=ON"
     "-DUSE_TRANSLATIONS=ON"
-    "-DQT_VERSION_MAJOR=${lib.versions.major qtbase.version}"
+    "-DQT_VERSION_MAJOR=${lib.versions.major qt6.qtbase.version}"
   ];
 
   preFixup = ''
@@ -102,4 +96,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "beamerpresenter";
   };
-}
+})

pkgs/applications/misc/goldendict-ng/default.nix → pkgs/by-name/go/goldendict-ng/package.nix

@@ -17,14 +17,7 @@
   bzip2,
   libiconv,
   libxtst,
-  qtbase,
-  qtsvg,
-  qtwebengine,
-  qttools,
-  qtwayland,
-  qt5compat,
-  qtmultimedia,
-  wrapQtAppsHook,
+  qt6,
   wrapGAppsHook3,
 }:
 
@@ -44,18 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
     wrapGAppsHook3
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qttools
-    qtwebengine
-    qt5compat
-    qtmultimedia
-    qtwayland
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtwebengine
+    qt6.qt5compat
+    qt6.qtmultimedia
+    qt6.qtwayland
     libvorbis
     tomlplusplus
     fmt

pkgs/applications/misc/kemai/default.nix → pkgs/by-name/ke/kemai/package.nix

@@ -6,19 +6,12 @@
   # buildInputs
   libxscrnsaver,
   magic-enum,
-
-  # nativeBuildInputs
-  qtbase,
-  qtconnectivity,
-  qtlanguageserver,
-  qttools,
+  qt6,
   range-v3,
   spdlog,
-  qtwayland,
 
   # nativeBuildInputs
   cmake,
-  wrapQtAppsHook,
 
   # passthru
   nix-update-script,
@@ -47,14 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     libxscrnsaver
     magic-enum
-    qtbase
-    qtconnectivity
-    qtlanguageserver
-    qttools
+    qt6.qtbase
+    qt6.qtconnectivity
+    qt6.qtlanguageserver
+    qt6.qttools
     range-v3
     spdlog
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland;
 
   cmakeFlags = [
     (lib.cmakeBool "KEMAI_ENABLE_UPDATE_CHECK" false)
@@ -63,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   passthru = {

pkgs/applications/misc/kiwix/default.nix → pkgs/by-name/ki/kiwix/package.nix

@@ -5,12 +5,7 @@
   nix-update-script,
   libkiwix,
   pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  qtsvg,
-  qtimageformats,
-  wrapQtAppsHook,
+  qt6,
   aria2,
 }:
 
@@ -30,17 +25,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
+    qt6.qmake
     pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libkiwix
-    qtbase
-    qtwebengine
-    qtsvg
-    qtimageformats
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qtimageformats
   ];
 
   qtWrapperArgs = [

pkgs/os-specific/linux/lenovo-legion/app.nix → pkgs/by-name/le/lenovo-legion/package.nix

@@ -2,10 +2,9 @@
   lib,
   fetchFromGitHub,
   libxcb,
-  wrapQtAppsHook,
   python3,
   nix-update-script,
-  qtbase,
+  qt6,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -24,12 +23,12 @@ python3.pkgs.buildPythonApplication rec {
 
   build-system = with python3.pkgs; [
     setuptools
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   dependencies = with python3.pkgs; [
     pyqt6
-    qtbase
+    qt6.qtbase
     argcomplete
     pillow
     pyyaml

pkgs/applications/science/electronics/librepcb/default.nix → pkgs/by-name/li/librepcb/package.nix

@@ -2,13 +2,10 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  qtsvg,
+  qt6,
   opencascade-occt,
   libGLU,
   cmake,
-  wrapQtAppsHook,
   rustPlatform,
   cargo,
   rustc,
@@ -28,15 +25,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    qtsvg
-    wrapQtAppsHook
+    qt6.qttools
+    qt6.qtsvg
+    qt6.wrapQtAppsHook
     opencascade-occt
     libGLU
     cargo
     rustc
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt6.qtbase ];
 
   cargoDeps1 = rustPlatform.fetchCargoVendor {
     inherit src;

pkgs/applications/networking/maestral-qt/default.nix → pkgs/by-name/ma/maestral-gui/package.nix

@@ -2,11 +2,8 @@
   lib,
   fetchFromGitHub,
   python3,
-  qtbase,
-  qtsvg,
-  qtwayland,
+  qt6,
   nixosTests,
-  wrapQtAppsHook,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -32,12 +29,12 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   buildInputs = [
-    qtwayland
-    qtbase
-    qtsvg # Needed for the systray icon
+    qt6.qtwayland
+    qt6.qtbase
+    qt6.qtsvg # Needed for the systray icon
   ];
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
 
   dontWrapQtApps = true;
 

pkgs/applications/misc/organicmaps/default.nix → pkgs/by-name/or/organicmaps/package.nix

@@ -8,11 +8,7 @@
   which,
   python3,
   rsync,
-  wrapQtAppsHook,
-  qtbase,
-  qtpositioning,
-  qtsvg,
-  qtwayland,
+  qt6,
   libGLU,
   libGL,
   zlib,
@@ -66,15 +62,15 @@ stdenv.mkDerivation (finalAttrs: {
     which
     python3
     rsync
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   # Most dependencies are vendored
   buildInputs = [
-    qtbase
-    qtpositioning
-    qtsvg
-    qtwayland
+    qt6.qtbase
+    qt6.qtpositioning
+    qt6.qtsvg
+    qt6.qtwayland
     libGLU
     libGL
     zlib

pkgs/applications/graphics/pineapple-pictures/default.nix → pkgs/by-name/pi/pineapple-pictures/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qt6Packages,
+  qt6,
   exiv2,
 }:
 
@@ -20,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    qt6Packages.qttools
-    qt6Packages.wrapQtAppsHook
+    qt6.qttools
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qt6Packages.qtsvg
+    qt6.qtsvg
     exiv2
   ];