From 702e8e6fc7c42c45b330965b71fef46829c7e778 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Sat, 10 May 2025 21:27:32 -0700
Subject: [PATCH] pkgs/applications/graphics: use callPackage

---
 .../graphics/cloudcompare/default.nix         | 15 ++--
 pkgs/applications/graphics/djview/default.nix | 11 ++-
 pkgs/applications/graphics/eddy/default.nix   |  3 +-
 .../graphics/evilpixie/default.nix            |  7 +-
 .../graphics/fontmatrix/default.nix           | 16 ++--
 pkgs/applications/graphics/fstl/default.nix   |  9 +-
 .../graphics/glabels-qt/default.nix           |  9 +-
 .../graphics/hdrmerge/default.nix             | 11 ++-
 pkgs/applications/graphics/imgp/default.nix   | 10 +--
 pkgs/applications/graphics/kcc/default.nix    |  6 +-
 .../graphics/kgraphviewer/default.nix         | 22 ++---
 pkgs/applications/graphics/ktikz/default.nix  | 17 ++--
 pkgs/applications/graphics/leocad/default.nix | 10 +--
 .../graphics/luminance-hdr/default.nix        | 18 ++--
 .../graphics/mandelbulber/default.nix         | 18 ++--
 .../graphics/meshlab-unstable/default.nix     | 19 +++--
 .../applications/graphics/meshlab/default.nix | 19 +++--
 .../graphics/openboard/default.nix            | 27 +++---
 .../graphics/openscad/default.nix             | 23 ++---
 .../graphics/opentoonz/default.nix            | 16 ++--
 pkgs/applications/graphics/ovito/default.nix  | 21 ++---
 .../graphics/paraview/default.nix             | 21 ++---
 .../graphics/photoflare/default.nix           | 17 ++--
 .../graphics/phototonic/default.nix           | 10 +--
 .../graphics/pick-colour-picker/default.nix   |  8 +-
 .../graphics/pineapple-pictures/default.nix   | 12 ++-
 .../graphics/pixinsight/default.nix           | 44 ++++------
 .../graphics/qcomicbook/default.nix           | 20 ++---
 pkgs/applications/graphics/qimgv/default.nix  | 20 ++---
 pkgs/applications/graphics/qosmic/default.nix | 10 +--
 .../graphics/qscreenshot/default.nix          | 15 ++--
 pkgs/applications/graphics/qvge/default.nix   | 12 ++-
 pkgs/applications/graphics/qview/default.nix  | 26 +++---
 .../rapid-photo-downloader/default.nix        |  5 +-
 .../graphics/scantailor/advanced.nix          | 12 +--
 .../graphics/scantailor/universal.nix         | 11 +--
 .../graphics/seamly2d/default.nix             | 24 ++----
 .../graphics/smartdeblur/default.nix          | 10 +--
 pkgs/applications/graphics/veusz/default.nix  |  7 +-
 .../graphics/yacreader/default.nix            | 24 +++---
 pkgs/top-level/all-packages.nix               | 85 +++++++++----------
 41 files changed, 304 insertions(+), 396 deletions(-)

diff --git a/pkgs/applications/graphics/cloudcompare/default.nix b/pkgs/applications/graphics/cloudcompare/default.nix
index 39ca9122d13a..bd6d3f856749 100644
--- a/pkgs/applications/graphics/cloudcompare/default.nix
+++ b/pkgs/applications/graphics/cloudcompare/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   makeDesktopItem,
   copyDesktopItems,
@@ -14,15 +14,13 @@
   laszip,
   mpfr,
   pcl,
-  qtbase,
-  qtsvg,
-  qttools,
+  libsForQt5,
   tbb,
   xercesc,
   wrapGAppsHook3,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "cloudcompare";
   version = "2.13.2";
 
@@ -39,6 +37,7 @@ mkDerivation rec {
     eigen # header-only
     wrapGAppsHook3
     copyDesktopItems
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -50,9 +49,9 @@ mkDerivation rec {
     laszip
     mpfr
     pcl
-    qtbase
-    qtsvg
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.qttools
     tbb
     xercesc
   ];
diff --git a/pkgs/applications/graphics/djview/default.nix b/pkgs/applications/graphics/djview/default.nix
index 2b78ac0d9ca8..bf8ccce9fe00 100644
--- a/pkgs/applications/graphics/djview/default.nix
+++ b/pkgs/applications/graphics/djview/default.nix
@@ -1,20 +1,18 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
   autoconf,
   automake,
   libtool,
   pkg-config,
   djvulibre,
-  qtbase,
-  qttools,
+  libsForQt5,
   xorg,
   libtiff,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "djview";
   version = "4.12";
 
@@ -33,12 +31,13 @@ mkDerivation rec {
     automake
     libtool
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     djvulibre
-    qtbase
+    libsForQt5.qtbase
     xorg.libXt
     libtiff
   ];
diff --git a/pkgs/applications/graphics/eddy/default.nix b/pkgs/applications/graphics/eddy/default.nix
index 6ea762ded515..5c41a460c099 100644
--- a/pkgs/applications/graphics/eddy/default.nix
+++ b/pkgs/applications/graphics/eddy/default.nix
@@ -4,7 +4,6 @@
   lib,
   jre,
   qt5,
-  wrapQtAppsHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -20,7 +19,7 @@ python3Packages.buildPythonApplication rec {
 
   propagatedBuildInputs = [
     qt5.qtbase
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
     python3Packages.setuptools
     python3Packages.rfc3987
     python3Packages.jpype1
diff --git a/pkgs/applications/graphics/evilpixie/default.nix b/pkgs/applications/graphics/evilpixie/default.nix
index 0c7bb0023cbf..caed9af31c21 100644
--- a/pkgs/applications/graphics/evilpixie/default.nix
+++ b/pkgs/applications/graphics/evilpixie/default.nix
@@ -5,8 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   libpng,
   giflib,
   libjpeg,
@@ -28,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libpng
     giflib
     libjpeg
diff --git a/pkgs/applications/graphics/fontmatrix/default.nix b/pkgs/applications/graphics/fontmatrix/default.nix
index 04f0ff9bf358..81e25a88101d 100644
--- a/pkgs/applications/graphics/fontmatrix/default.nix
+++ b/pkgs/applications/graphics/fontmatrix/default.nix
@@ -1,13 +1,12 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
-  qttools,
-  qtwebkit,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "fontmatrix";
   version = "0.9.100";
 
@@ -19,11 +18,14 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    qttools
-    qtwebkit
+    libsForQt5.qttools
+    libsForQt5.qtwebkit
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   meta = with lib; {
     description = "Fontmatrix is a free/libre font explorer for Linux, Windows and Mac";
diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix
index f58b7b7c6365..e5c9dfdd8e48 100644
--- a/pkgs/applications/graphics/fstl/default.nix
+++ b/pkgs/applications/graphics/fstl/default.nix
@@ -2,15 +2,18 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  mkDerivation,
   cmake,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "fstl";
   version = "0.11.0";
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   installPhase = lib.optionalString stdenv.hostPlatform.isDarwin ''
     runHook preInstall
diff --git a/pkgs/applications/graphics/glabels-qt/default.nix b/pkgs/applications/graphics/glabels-qt/default.nix
index 6865060f2fc2..9ba7740f096d 100644
--- a/pkgs/applications/graphics/glabels-qt/default.nix
+++ b/pkgs/applications/graphics/glabels-qt/default.nix
@@ -1,12 +1,12 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   cmake,
-  mkDerivation,
-  qttools,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "glabels-qt";
   version = "unstable-2021-02-06";
 
@@ -19,7 +19,8 @@ mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/graphics/hdrmerge/default.nix b/pkgs/applications/graphics/hdrmerge/default.nix
index 5199cfe6c06a..c743ba7196b8 100644
--- a/pkgs/applications/graphics/hdrmerge/default.nix
+++ b/pkgs/applications/graphics/hdrmerge/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   libraw,
   exiv2,
   zlib,
@@ -14,7 +13,7 @@
   copyDesktopItems,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "hdrmerge";
   version = "0.5.0-unstable-2024-08-02";
   src = fetchFromGitHub {
@@ -27,12 +26,12 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     copyDesktopItems
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libraw
     exiv2
     zlib
diff --git a/pkgs/applications/graphics/imgp/default.nix b/pkgs/applications/graphics/imgp/default.nix
index 3855d3e16ba5..958963cc8766 100644
--- a/pkgs/applications/graphics/imgp/default.nix
+++ b/pkgs/applications/graphics/imgp/default.nix
@@ -1,15 +1,13 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonApplication,
-  pythonOlder,
-  pillow,
+  python3Packages,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "imgp";
   version = "2.9";
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "jarun";
@@ -18,7 +16,7 @@ buildPythonApplication rec {
     hash = "sha256-yQ2BzOBn6Bl9ieZkREKsj1zLnoPcf0hZhZ90Za5kiKA=";
   };
 
-  propagatedBuildInputs = [ pillow ];
+  propagatedBuildInputs = [ python3Packages.pillow ];
 
   installFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/applications/graphics/kcc/default.nix b/pkgs/applications/graphics/kcc/default.nix
index 5df0e6fe2ba1..0eeddade1d58 100644
--- a/pkgs/applications/graphics/kcc/default.nix
+++ b/pkgs/applications/graphics/kcc/default.nix
@@ -1,13 +1,13 @@
 {
   lib,
-  mkDerivationWith,
   python3Packages,
   fetchPypi,
+  libsForQt5,
   p7zip,
   archiveSupport ? true,
 }:
 
-mkDerivationWith python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "kcc";
   version = "5.5.1";
 
@@ -17,6 +17,8 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
     sha256 = "5dbee5dc5ee06a07316ae5ebaf21ffa1970094dbae5985ad735e2807ef112644";
   };
 
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
+
   propagatedBuildInputs = with python3Packages; [
     pillow
     pyqt5
diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix
index b387a1a8d918..27320c563890 100644
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@@ -1,24 +1,17 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchurl,
   cmake,
   extra-cmake-modules,
   pkg-config,
   wrapGAppsHook3,
-  kconfig,
-  kinit,
-  kdoctools,
-  kio,
-  kparts,
-  kwidgetsaddons,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   boost,
   graphviz,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kgraphviewer";
   version = "2.4.3";
 
@@ -28,8 +21,8 @@ mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     boost
     graphviz
   ];
@@ -39,10 +32,11 @@ mkDerivation rec {
     extra-cmake-modules
     pkg-config
     wrapGAppsHook3
-    kdoctools
+    libsForQt5.kdoctools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with libsForQt5; [
     kconfig
     kinit
     kio
diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix
index c267b563d974..52d43879186f 100644
--- a/pkgs/applications/graphics/ktikz/default.nix
+++ b/pkgs/applications/graphics/ktikz/default.nix
@@ -4,12 +4,9 @@
   fetchFromGitHub,
   fetchpatch,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   poppler,
   gnuplot,
-  qmake,
-  qtbase,
-  qttools,
 }:
 
 # This package only builds ktikz without KDE integration because KDE4 is
@@ -54,15 +51,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qttools
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+  QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}";
 
   buildInputs = [
-    qtbase
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.poppler
   ];
 
   qmakeFlags = [
diff --git a/pkgs/applications/graphics/leocad/default.nix b/pkgs/applications/graphics/leocad/default.nix
index 49ee98e95d8f..2e664479513d 100644
--- a/pkgs/applications/graphics/leocad/default.nix
+++ b/pkgs/applications/graphics/leocad/default.nix
@@ -4,12 +4,10 @@
   fetchFromGitHub,
   fetchurl,
   povray,
-  qmake,
-  qttools,
+  libsForQt5,
   replaceVars,
   zlib,
   testers,
-  wrapQtAppsHook,
   nix-update-script,
   libGL,
 }:
@@ -38,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix
index e12bca037461..ad53e38ef7cf 100644
--- a/pkgs/applications/graphics/luminance-hdr/default.nix
+++ b/pkgs/applications/graphics/luminance-hdr/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitHub,
   fetchpatch,
@@ -14,14 +14,11 @@
   libraw,
   libtiff,
   openexr,
-  qtbase,
-  qtdeclarative,
-  qttools,
-  qtwebengine,
+  libsForQt5,
   eigen,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "luminance-hdr";
   version = "2.6.1.1";
 
@@ -43,10 +40,10 @@ mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
 
   buildInputs = [
-    qtbase
-    qtdeclarative
-    qttools
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qttools
+    libsForQt5.qtwebengine
     eigen
     boost
     exiv2
@@ -60,6 +57,7 @@ mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    libsForQt5.wrapQtAppsHook
     cmake
     pkg-config
   ];
diff --git a/pkgs/applications/graphics/mandelbulber/default.nix b/pkgs/applications/graphics/mandelbulber/default.nix
index 912e3b963175..e57017bb6a34 100644
--- a/pkgs/applications/graphics/mandelbulber/default.nix
+++ b/pkgs/applications/graphics/mandelbulber/default.nix
@@ -1,15 +1,12 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   libpng,
   gsl,
   libsndfile,
   lzo,
-  qmake,
-  qttools,
-  qtbase,
-  qtmultimedia,
+  libsForQt5,
   withOpenCL ? true,
   opencl-clhpp ? null,
   ocl-icd ? null,
@@ -18,7 +15,7 @@
 assert withOpenCL -> opencl-clhpp != null;
 assert withOpenCL -> ocl-icd != null;
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "mandelbulber";
   version = "2.32";
 
@@ -30,13 +27,14 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
   buildInputs =
     [
-      qtbase
-      qtmultimedia
+      libsForQt5.qtbase
+      libsForQt5.qtmultimedia
       libpng
       gsl
       libsndfile
diff --git a/pkgs/applications/graphics/meshlab-unstable/default.nix b/pkgs/applications/graphics/meshlab-unstable/default.nix
index 714a3c61d67b..23ea4b2c63c9 100644
--- a/pkgs/applications/graphics/meshlab-unstable/default.nix
+++ b/pkgs/applications/graphics/meshlab-unstable/default.nix
@@ -1,11 +1,9 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
+  libsForQt5,
   libGLU,
-  qtbase,
-  qtscript,
-  qtxmlpatterns,
   lib3ds,
   bzip2,
   muparser,
@@ -43,7 +41,7 @@ let
     hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
   };
 in
-mkDerivation {
+stdenv.mkDerivation {
   pname = "meshlab-unstable";
   version = "2023.12-unstable-2025-02-21";
 
@@ -59,9 +57,9 @@ mkDerivation {
 
   buildInputs = [
     libGLU
-    qtbase
-    qtscript
-    qtxmlpatterns
+    libsForQt5.qtbase
+    libsForQt5.qtscript
+    libsForQt5.qtxmlpatterns
     lib3ds
     bzip2
     muparser
@@ -82,7 +80,10 @@ mkDerivation {
     structuresynth
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   preConfigure = ''
     mkdir src/external/downloads
diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix
index 710ab40c6dbc..c78afc438302 100644
--- a/pkgs/applications/graphics/meshlab/default.nix
+++ b/pkgs/applications/graphics/meshlab/default.nix
@@ -1,11 +1,9 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
+  libsForQt5,
   libGLU,
-  qtbase,
-  qtscript,
-  qtxmlpatterns,
   lib3ds,
   bzip2,
   muparser,
@@ -36,7 +34,7 @@ let
     hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
   };
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "meshlab";
   version = "2023.12";
 
@@ -49,9 +47,9 @@ mkDerivation rec {
 
   buildInputs = [
     libGLU
-    qtbase
-    qtscript
-    qtxmlpatterns
+    libsForQt5.qtbase
+    libsForQt5.qtscript
+    libsForQt5.qtxmlpatterns
     lib3ds
     bzip2
     muparser
@@ -73,7 +71,10 @@ mkDerivation rec {
     structuresynth
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   preConfigure = ''
     substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
diff --git a/pkgs/applications/graphics/openboard/default.nix b/pkgs/applications/graphics/openboard/default.nix
index 519a0d5d5fdf..31db31a40c4d 100644
--- a/pkgs/applications/graphics/openboard/default.nix
+++ b/pkgs/applications/graphics/openboard/default.nix
@@ -4,16 +4,11 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qmake,
-  qtbase,
-  qtxmlpatterns,
-  qttools,
-  qtwebengine,
+  libsForQt5,
   libGL,
   fontconfig,
   openssl,
   poppler,
-  wrapQtAppsHook,
   ffmpeg,
   libva,
   alsa-lib,
@@ -27,7 +22,6 @@
   lame,
   fdk_aac,
   libass,
-  quazip,
   libXext,
   libXfixes,
 }:
@@ -44,8 +38,11 @@ let
       sha256 = "19zhgsimy0f070caikc4vrrqyc8kv2h6rl37sy3iggks8z0g98gf";
     };
 
-    nativeBuildInputs = [ qmake ];
-    buildInputs = [ qtbase ];
+    nativeBuildInputs = [
+      libsForQt5.qmake
+      libsForQt5.wrapQtAppsHook
+    ];
+    buildInputs = [ libsForQt5.qtbase ];
     dontWrapQtApps = true;
 
     installPhase = ''
@@ -79,14 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qttools
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qttools
+    libsForQt5.qtwebengine
     libGL
     fontconfig
     openssl
@@ -104,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     lame
     fdk_aac
     libass
-    quazip
+    libsForQt5.quazip
     libXext
     libXfixes
   ];
diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix
index 6bac0594b028..f4d8d03de2d3 100644
--- a/pkgs/applications/graphics/openscad/default.nix
+++ b/pkgs/applications/graphics/openscad/default.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qtbase,
-  qtmultimedia,
-  qscintilla,
+  libsForQt5,
   bison,
   flex,
   eigen,
@@ -26,21 +24,17 @@
   double-conversion,
   lib3mf,
   libzip,
-  mkDerivation,
-  qtmacextras,
-  qmake,
   spacenavSupport ? stdenv.hostPlatform.isLinux,
   libspnav,
   wayland,
   wayland-protocols,
   wrapGAppsHook3,
-  qtwayland,
   cairo,
   openscad,
   runCommand,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "openscad";
   version = "2021.01";
 
@@ -95,7 +89,8 @@ mkDerivation rec {
     flex
     pkg-config
     gettext
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
     wrapGAppsHook3
   ];
 
@@ -115,9 +110,9 @@ mkDerivation rec {
       double-conversion
       freetype
       fontconfig
-      qtbase
-      qtmultimedia
-      qscintilla
+      libsForQt5.qtbase
+      libsForQt5.qtmultimedia
+      libsForQt5.qscintilla
       cairo
     ]
     ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -125,9 +120,9 @@ mkDerivation rec {
       libGL
       wayland
       wayland-protocols
-      qtwayland
+      libsForQt5.qtwayland
     ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin qtmacextras
+    ++ lib.optional stdenv.hostPlatform.isDarwin libsForQt5.qtmacextras
     ++ lib.optional spacenavSupport libspnav;
 
   qmakeFlags =
diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix
index c53122f52434..bf02ff0c8914 100644
--- a/pkgs/applications/graphics/opentoonz/default.nix
+++ b/pkgs/applications/graphics/opentoonz/default.nix
@@ -5,6 +5,7 @@
   libglut,
   freetype,
   glew,
+  libsForQt5,
   libjpeg,
   libmypaint,
   libpng,
@@ -15,14 +16,9 @@
   openblas,
   opencv,
   pkg-config,
-  qtbase,
-  qtmultimedia,
-  qtscript,
-  qtserialport,
   lib,
   stdenv,
   superlu,
-  wrapQtAppsHook,
   libtiff,
   zlib,
 }:
@@ -103,7 +99,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -121,10 +117,10 @@ stdenv.mkDerivation {
     lzo
     openblas
     opentoonz-opencv
-    qtbase
-    qtmultimedia
-    qtscript
-    qtserialport
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtscript
+    libsForQt5.qtserialport
     superlu
   ];
 
diff --git a/pkgs/applications/graphics/ovito/default.nix b/pkgs/applications/graphics/ovito/default.nix
index 19c02eeec154..dfef8beb322c 100644
--- a/pkgs/applications/graphics/ovito/default.nix
+++ b/pkgs/applications/graphics/ovito/default.nix
@@ -14,14 +14,8 @@
   netcdf,
   openssl,
   python3,
-  qscintilla,
-  qtbase,
-  qtsvg,
-  qttools,
-  wrapQtAppsHook,
+  qt6Packages,
   copyDesktopItems,
-  # needed to run natively on wayland
-  qtwayland,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +33,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     copyDesktopItems
   ];
 
@@ -53,11 +47,12 @@ stdenv.mkDerivation rec {
     netcdf
     openssl
     python3
-    qscintilla
-    qtbase
-    qtsvg
-    qttools
-    qtwayland
+    qt6Packages.qscintilla
+    qt6Packages.qtbase
+    qt6Packages.qtsvg
+    qt6Packages.qttools
+    # needed to run natively on wayland
+    qt6Packages.qtwayland
   ];
 
   # manually create a desktop file
diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix
index b41e63e2c2df..d62b20303b21 100644
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@@ -6,12 +6,7 @@
   boost,
   cmake,
   ffmpeg,
-  wrapQtAppsHook,
-  qtbase,
-  qtx11extras,
-  qttools,
-  qtxmlpatterns,
-  qtsvg,
+  libsForQt5,
   gdal,
   gfortran,
   libXt,
@@ -62,7 +57,7 @@ stdenv.mkDerivation rec {
 
   # Find the Qt platform plugin "minimal"
   preConfigure = ''
-    export QT_PLUGIN_PATH=${qtbase.bin}/${qtbase.qtPluginPrefix}
+    export QT_PLUGIN_PATH=${libsForQt5.qtbase.bin}/${libsForQt5.qtbase.qtPluginPrefix}
   '';
 
   cmakeFlags = [
@@ -88,7 +83,7 @@ stdenv.mkDerivation rec {
     makeWrapper
     ninja
     gfortran
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -100,11 +95,11 @@ stdenv.mkDerivation rec {
     boost
     ffmpeg
     gdal
-    qtbase
-    qtx11extras
-    qttools
-    qtxmlpatterns
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+    libsForQt5.qttools
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qtsvg
   ];
 
   postInstall =
diff --git a/pkgs/applications/graphics/photoflare/default.nix b/pkgs/applications/graphics/photoflare/default.nix
index 75645349377b..694f486733db 100644
--- a/pkgs/applications/graphics/photoflare/default.nix
+++ b/pkgs/applications/graphics/photoflare/default.nix
@@ -1,14 +1,12 @@
 {
-  mkDerivation,
   lib,
-  graphicsmagick,
+  stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
+  libsForQt5,
+  graphicsmagick,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "photoflare";
   version = "1.6.13";
 
@@ -20,11 +18,12 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     graphicsmagick
   ];
 
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index fca4490d3448..360f76a387e3 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   exiv2,
 }:
 
@@ -29,11 +27,11 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     exiv2
   ];
 
diff --git a/pkgs/applications/graphics/pick-colour-picker/default.nix b/pkgs/applications/graphics/pick-colour-picker/default.nix
index b94c0b2d6278..723a5d209833 100644
--- a/pkgs/applications/graphics/pick-colour-picker/default.nix
+++ b/pkgs/applications/graphics/pick-colour-picker/default.nix
@@ -1,16 +1,14 @@
 {
   lib,
   fetchFromGitHub,
-  buildPythonPackage,
-  pygobject3,
-  pycairo,
+  python3Packages,
   glib,
   gtk3,
   gobject-introspection,
   wrapGAppsHook3,
 }:
 
-buildPythonPackage {
+python3Packages.buildPythonPackage {
   pname = "pick-colour-picker";
   version = "unstable-2022-05-08";
 
@@ -32,7 +30,7 @@ buildPythonPackage {
     wrapGAppsHook3
   ];
 
-  pythonPath = [
+  pythonPath = with python3Packages; [
     pygobject3
     pycairo
   ];
diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix
index a5e54f3f9120..2130b2bd6e5e 100644
--- a/pkgs/applications/graphics/pineapple-pictures/default.nix
+++ b/pkgs/applications/graphics/pineapple-pictures/default.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtsvg,
-  qttools,
-  exiv2,
-  wrapQtAppsHook,
   cmake,
+  qt6Packages,
+  exiv2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,12 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtsvg
+    qt6Packages.qtsvg
     exiv2
   ];
 
diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix
index 3cce7faf76d0..b2edec42104f 100644
--- a/pkgs/applications/graphics/pixinsight/default.nix
+++ b/pkgs/applications/graphics/pixinsight/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   requireFile,
-  wrapQtAppsHook,
   autoPatchelfHook,
   unixtools,
   fakeroot,
@@ -31,20 +30,7 @@
   gdk-pixbuf,
   gtk3,
   pango,
-  # Qt 6 subpackages
-  qtbase,
-  qtserialport,
-  qtserialbus,
-  qtvirtualkeyboard,
-  qtmultimedia,
-  qt3d,
-  mlt,
-  qtlocation,
-  qtwebengine,
-  qtquick3d,
-  qtwayland,
-  qtwebview,
-  qtscxml,
+  qt6Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -68,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     unixtools.script
     fakeroot
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     autoPatchelfHook
     mailcap
     libudev0-shim
@@ -102,20 +88,20 @@ stdenv.mkDerivation (finalAttrs: {
       gtk3
       pango
       # Qt stuff
-      qt3d
-      mlt
-      qtbase
+      qt6Packages.qt3d
+      qt6Packages.mlt
+      qt6Packages.qtbase
       #qtgamepad
-      qtserialport
-      qtserialbus
-      qtvirtualkeyboard
-      qtmultimedia
-      qtlocation
-      qtwebengine
-      qtquick3d
-      qtwayland
-      qtwebview
-      qtscxml
+      qt6Packages.qtserialport
+      qt6Packages.qtserialbus
+      qt6Packages.qtvirtualkeyboard
+      qt6Packages.qtmultimedia
+      qt6Packages.qtlocation
+      qt6Packages.qtwebengine
+      qt6Packages.qtquick3d
+      qt6Packages.qtwayland
+      qt6Packages.qtwebview
+      qt6Packages.qtscxml
     ]
     ++ (with xorg; [
       libX11
diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix
index 734a49f02622..80be53583a9c 100644
--- a/pkgs/applications/graphics/qcomicbook/default.nix
+++ b/pkgs/applications/graphics/qcomicbook/default.nix
@@ -1,16 +1,13 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
-  pkg-config,
   cmake,
-  qtbase,
-  qttools,
-  qtx11extras,
-  poppler,
+  pkg-config,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qcomicbook";
   version = "0.9.1";
 
@@ -24,13 +21,14 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qttools
-    qtx11extras
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
+    libsForQt5.poppler
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix
index 338bd5ff3f14..03b78893bf06 100644
--- a/pkgs/applications/graphics/qimgv/default.nix
+++ b/pkgs/applications/graphics/qimgv/default.nix
@@ -1,21 +1,16 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
-
   cmake,
   pkg-config,
-
+  libsForQt5,
   exiv2,
   mpv,
   opencv4,
-  qtbase,
-  qtimageformats,
-  qtsvg,
-  qttools,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qimgv";
   version = "1.0.3-unstable-2024-10-11";
 
@@ -29,6 +24,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
@@ -39,10 +35,10 @@ mkDerivation rec {
     exiv2
     mpv
     opencv4
-    qtbase
-    qtimageformats
-    qtsvg
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qtimageformats
+    libsForQt5.qtsvg
+    libsForQt5.qttools
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/graphics/qosmic/default.nix b/pkgs/applications/graphics/qosmic/default.nix
index 3643a9e7af4f..40e6dbc5330b 100644
--- a/pkgs/applications/graphics/qosmic/default.nix
+++ b/pkgs/applications/graphics/qosmic/default.nix
@@ -2,9 +2,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   pkg-config,
   lua,
   flam3,
@@ -51,13 +49,13 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
     pkg-config
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     lua
     flam3
     libxml2
diff --git a/pkgs/applications/graphics/qscreenshot/default.nix b/pkgs/applications/graphics/qscreenshot/default.nix
index fe3b679facf0..9c8beae294a3 100644
--- a/pkgs/applications/graphics/qscreenshot/default.nix
+++ b/pkgs/applications/graphics/qscreenshot/default.nix
@@ -1,12 +1,9 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchgit,
-  qtbase,
-  qttools,
-  qtx11extras,
-  wrapQtAppsHook,
   cmake,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -23,12 +20,12 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
   ];
   meta = with lib; {
     description = "Simple creation and editing of screenshots";
diff --git a/pkgs/applications/graphics/qvge/default.nix b/pkgs/applications/graphics/qvge/default.nix
index 38f74d11f327..28f3f99c4946 100644
--- a/pkgs/applications/graphics/qvge/default.nix
+++ b/pkgs/applications/graphics/qvge/default.nix
@@ -3,10 +3,7 @@
   stdenv,
   fetchFromGitHub,
   replaceVars,
-  wrapQtAppsHook,
-  qmake,
-  qtsvg,
-  qtx11extras,
+  libsForQt5,
   graphviz,
 }:
 
@@ -31,11 +28,12 @@ stdenv.mkDerivation rec {
   );
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
   ];
 
-  buildInputs = if stdenv.hostPlatform.isDarwin then [ qtsvg ] else [ qtx11extras ];
+  buildInputs =
+    if stdenv.hostPlatform.isDarwin then [ libsForQt5.qtsvg ] else [ libsForQt5.qtx11extras ];
 
   meta = with lib; {
     description = "Qt Visual Graph Editor";
diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix
index eb2f81c93984..a3b29c425fe7 100644
--- a/pkgs/applications/graphics/qview/default.nix
+++ b/pkgs/applications/graphics/qview/default.nix
@@ -1,17 +1,12 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
-  qtimageformats,
-  qtsvg,
-  qtx11extras,
+  libsForQt5,
   x11Support ? true,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qview";
   version = "6.1";
 
@@ -24,14 +19,17 @@ mkDerivation rec {
 
   qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   buildInputs = [
-    qtbase
-    qttools
-    qtimageformats
-    qtsvg
-  ] ++ lib.optionals x11Support [ qtx11extras ];
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtimageformats
+    libsForQt5.qtsvg
+  ] ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
 
   meta = with lib; {
     description = "Practical and minimal image viewer";
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index da1e3487a5c1..8e86020d2354 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
-  mkDerivationWith,
   fetchFromGitHub,
   python3Packages,
+  libsForQt5,
   file,
   intltool,
   gobject-introspection,
@@ -20,7 +20,7 @@
   gitUpdater,
 }:
 
-mkDerivationWith python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "rapid-photo-downloader";
   version = "0.9.36";
   pyproject = true;
@@ -75,6 +75,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec {
   '';
 
   nativeBuildInputs = [
+    libsForQt5.wrapQtAppsHook
     file
     intltool
     gobject-introspection
diff --git a/pkgs/applications/graphics/scantailor/advanced.nix b/pkgs/applications/graphics/scantailor/advanced.nix
index 954ddb4f407c..17402ceac1a4 100644
--- a/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/pkgs/applications/graphics/scantailor/advanced.nix
@@ -1,17 +1,16 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
-  mkDerivation,
   cmake,
+  libsForQt5,
   libjpeg,
   libpng,
   libtiff,
   boost,
-  qtbase,
-  qttools,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "scantailor-advanced";
   version = "1.0.19";
 
@@ -24,14 +23,15 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
   buildInputs = [
     libjpeg
     libpng
     libtiff
     boost
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/graphics/scantailor/universal.nix b/pkgs/applications/graphics/scantailor/universal.nix
index b7bdc609f61c..739878f63ccc 100644
--- a/pkgs/applications/graphics/scantailor/universal.nix
+++ b/pkgs/applications/graphics/scantailor/universal.nix
@@ -1,12 +1,9 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   zlib,
   openjpeg,
   libjpeg_turbo,
@@ -29,7 +26,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     zlib
     libjpeg_turbo
     libpng
@@ -40,8 +37,8 @@ stdenv.mkDerivation rec {
   ];
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   meta = with lib; {
diff --git a/pkgs/applications/graphics/seamly2d/default.nix b/pkgs/applications/graphics/seamly2d/default.nix
index e72238dfd5b2..6f0b5189fb3a 100644
--- a/pkgs/applications/graphics/seamly2d/default.nix
+++ b/pkgs/applications/graphics/seamly2d/default.nix
@@ -1,23 +1,17 @@
 {
-  stdenv,
   lib,
-  qtbase,
-  wrapQtAppsHook,
+  stdenv,
   fetchFromGitHub,
+  libsForQt5,
   addDriverRunpath,
   poppler-utils,
-  qtxmlpatterns,
-  qtsvg,
   libgbm,
   xvfb-run,
   fontconfig,
   freetype,
   xorg,
-  qmake,
   python3,
-  qttools,
   git,
-  qtmultimedia,
 }:
 let
   qtPython = python3.withPackages (pkgs: with pkgs; [ pyqt5 ]);
@@ -34,13 +28,13 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtmultimedia
+    libsForQt5.qtmultimedia
     git
     qtPython
-    qtbase
+    libsForQt5.qtbase
     poppler-utils
-    qtxmlpatterns
-    qtsvg
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qtsvg
     libgbm
     freetype
     xorg.libXi
@@ -52,9 +46,9 @@ stdenv.mkDerivation rec {
     addDriverRunpath
     xvfb-run
     fontconfig
-    wrapQtAppsHook
-    qmake
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/graphics/smartdeblur/default.nix b/pkgs/applications/graphics/smartdeblur/default.nix
index a1c7dee5f842..e4991aed629b 100644
--- a/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/pkgs/applications/graphics/smartdeblur/default.nix
@@ -3,9 +3,7 @@
   lib,
   fetchFromGitHub,
   fftw,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,11 +20,11 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     fftw
   ];
 
diff --git a/pkgs/applications/graphics/veusz/default.nix b/pkgs/applications/graphics/veusz/default.nix
index 4622f87d9312..1974466317f8 100644
--- a/pkgs/applications/graphics/veusz/default.nix
+++ b/pkgs/applications/graphics/veusz/default.nix
@@ -2,8 +2,7 @@
   lib,
   python3Packages,
   fetchPypi,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -16,12 +15,12 @@ python3Packages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     python3Packages.sip
     python3Packages.tomli
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   # veusz is a script and not an ELF-executable, so wrapQtAppsHook will not wrap
   # it automatically -> we have to do it explicitly
diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix
index 692463174da6..8c6f7f854d42 100644
--- a/pkgs/applications/graphics/yacreader/default.nix
+++ b/pkgs/applications/graphics/yacreader/default.nix
@@ -1,20 +1,15 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitHub,
-  qmake,
+  libsForQt5,
   poppler,
   pkg-config,
   libunarr,
   libGLU,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtscript,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "yacreader";
   version = "9.15.0";
 
@@ -26,20 +21,21 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     poppler
     libunarr
     libGLU
-    qtmultimedia
-    qtscript
+    libsForQt5.qtmultimedia
+    libsForQt5.qtscript
   ];
   propagatedBuildInputs = [
-    qtquickcontrols2
-    qtgraphicaleffects
-    qtdeclarative
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtdeclarative
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad1bacc7f5e4..2a17f74476c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2180,7 +2180,7 @@ with pkgs;
 
   easyocr = with python3.pkgs; toPythonApplication easyocr;
 
-  eddy = libsForQt5.callPackage ../applications/graphics/eddy { };
+  eddy = callPackage ../applications/graphics/eddy { };
 
   element-web = callPackage ../by-name/el/element-web/package.nix {
     conf = config.element-web.conf or { };
@@ -3015,7 +3015,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  fontmatrix = libsForQt5.callPackage ../applications/graphics/fontmatrix { };
+  fontmatrix = callPackage ../applications/graphics/fontmatrix { };
 
   fox = callPackage ../development/libraries/fox { };
 
@@ -3037,7 +3037,7 @@ with pkgs;
 
   frostwire-bin = callPackage ../applications/networking/p2p/frostwire/frostwire-bin.nix { };
 
-  fstl = qt5.callPackage ../applications/graphics/fstl { };
+  fstl = callPackage ../applications/graphics/fstl { };
 
   fwknop = callPackage ../tools/security/fwknop {
     texinfo = texinfo6_7; # Uses @setcontentsaftertitlepage, removed in 6.8.
@@ -3523,7 +3523,7 @@ with pkgs;
       ocamlPackages = ocaml_p;
     };
 
-  leocad = libsForQt5.callPackage ../applications/graphics/leocad { };
+  leocad = callPackage ../applications/graphics/leocad { };
 
   libcoap = callPackage ../applications/networking/libcoap {
     autoconf = buildPackages.autoconf269;
@@ -3988,7 +3988,7 @@ with pkgs;
     jre = pkgs.jre_headless;
   };
 
-  openboard = libsForQt5.callPackage ../applications/graphics/openboard { };
+  openboard = callPackage ../applications/graphics/openboard { };
 
   ophcrack-cli = ophcrack.override { enableGui = false; };
 
@@ -4095,7 +4095,7 @@ with pkgs;
 
   ossec-server = callPackage ../tools/security/ossec/server.nix { };
 
-  ovito = qt6Packages.callPackage ../applications/graphics/ovito { };
+  ovito = callPackage ../applications/graphics/ovito { };
 
   p4c = callPackage ../development/compilers/p4c {
     protobuf = protobuf_21;
@@ -4311,9 +4311,9 @@ with pkgs;
 
   qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
 
-  qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { };
+  qosmic = callPackage ../applications/graphics/qosmic { };
 
-  qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { };
+  qtikz = callPackage ../applications/graphics/ktikz { };
 
   qtspim = libsForQt5.callPackage ../development/tools/misc/qtspim { };
 
@@ -4321,9 +4321,9 @@ with pkgs;
 
   quota = if stdenv.hostPlatform.isLinux then linuxquota else unixtools.quota;
 
-  qvge = libsForQt5.callPackage ../applications/graphics/qvge { };
+  qvge = callPackage ../applications/graphics/qvge { };
 
-  qview = libsForQt5.callPackage ../applications/graphics/qview { };
+  qview = callPackage ../applications/graphics/qview { };
 
   wayback_machine_downloader = callPackage ../applications/networking/wayback_machine_downloader { };
 
@@ -7190,7 +7190,7 @@ with pkgs;
 
   chruby = callPackage ../development/tools/misc/chruby { rubies = null; };
 
-  cloudcompare = libsForQt5.callPackage ../applications/graphics/cloudcompare { };
+  cloudcompare = callPackage ../applications/graphics/cloudcompare { };
 
   cookiecutter = with python3Packages; toPythonApplication cookiecutter;
 
@@ -7432,7 +7432,7 @@ with pkgs;
 
   jenkins-job-builder = with python3Packages; toPythonApplication jenkins-job-builder;
 
-  kcc = libsForQt5.callPackage ../applications/graphics/kcc { };
+  kcc = callPackage ../applications/graphics/kcc { };
 
   kustomize = callPackage ../development/tools/kustomize { };
 
@@ -10367,7 +10367,7 @@ with pkgs;
   freshrss = callPackage ../servers/web-apps/freshrss { };
   freshrss-extensions = recurseIntoAttrs (callPackage ../servers/web-apps/freshrss/extensions { });
 
-  glabels-qt = libsForQt5.callPackage ../applications/graphics/glabels-qt { };
+  glabels-qt = callPackage ../applications/graphics/glabels-qt { };
 
   grafana = callPackage ../servers/monitoring/grafana { };
   grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
@@ -12170,7 +12170,7 @@ with pkgs;
 
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
-  djview = libsForQt5.callPackage ../applications/graphics/djview { };
+  djview = callPackage ../applications/graphics/djview { };
   djview4 = djview;
 
   dmenu = callPackage ../applications/misc/dmenu { };
@@ -12208,7 +12208,7 @@ with pkgs;
   drawio-headless = callPackage ../applications/graphics/drawio/headless.nix { };
 
   drawpile = callPackage ../applications/graphics/drawpile { };
-  drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile {
+  drawpile-server-headless = drawpile.override {
     buildClient = false;
     buildServerGui = false;
   };
@@ -12277,7 +12277,7 @@ with pkgs;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
-  evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { };
+  evilpixie = callPackage ../applications/graphics/evilpixie { };
 
   greenfoot = callPackage ../applications/editors/greenfoot {
     openjdk = openjdk21.override {
@@ -12288,7 +12288,7 @@ with pkgs;
 
   haruna = kdePackages.callPackage ../applications/video/haruna { };
 
-  hdrmerge = libsForQt5.callPackage ../applications/graphics/hdrmerge { };
+  hdrmerge = callPackage ../applications/graphics/hdrmerge { };
 
   input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
     avahi = avahi.override { withLibdnssdCompat = true; };
@@ -12774,7 +12774,7 @@ with pkgs;
 
   pixel2svg = python310Packages.callPackage ../tools/graphics/pixel2svg { };
 
-  pixinsight = qt6Packages.callPackage ../applications/graphics/pixinsight { };
+  pixinsight = callPackage ../applications/graphics/pixinsight { };
 
   inherit (callPackage ../applications/virtualization/singularity/packages.nix { })
     apptainer
@@ -12956,7 +12956,7 @@ with pkgs;
 
   img2pdf = with python3Packages; toPythonApplication img2pdf;
 
-  imgp = python3Packages.callPackage ../applications/graphics/imgp { };
+  imgp = callPackage ../applications/graphics/imgp { };
 
   inkscape = callPackage ../applications/graphics/inkscape {
     lcms = lcms2;
@@ -13030,7 +13030,7 @@ with pkgs;
 
   kexi = libsForQt5.callPackage ../applications/office/kexi { };
 
-  kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
+  kgraphviewer = callPackage ../applications/graphics/kgraphviewer { };
 
   kid3-cli = kid3.override {
     withCLI = true;
@@ -13236,7 +13236,7 @@ with pkgs;
     portaudio = null;
   };
 
-  luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr {
+  luminanceHDR = callPackage ../applications/graphics/luminance-hdr {
     openexr = openexr_2;
   };
 
@@ -13270,7 +13270,7 @@ with pkgs;
     shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
   };
 
-  mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { };
+  mandelbulber = callPackage ../applications/graphics/mandelbulber { };
 
   mapmap = libsForQt5.callPackage ../applications/video/mapmap { };
 
@@ -13298,8 +13298,8 @@ with pkgs;
 
   meshcentral = callPackage ../tools/admin/meshcentral { };
 
-  meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { };
-  meshlab-unstable = libsForQt5.callPackage ../applications/graphics/meshlab-unstable { };
+  meshlab = callPackage ../applications/graphics/meshlab { };
+  meshlab-unstable = callPackage ../applications/graphics/meshlab-unstable { };
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };
 
@@ -13404,7 +13404,7 @@ with pkgs;
 
   rquickshare-legacy = rquickshare.override { app-type = "legacy"; };
 
-  seamly2d = libsForQt5.callPackage ../applications/graphics/seamly2d { };
+  seamly2d = callPackage ../applications/graphics/seamly2d { };
 
   # a somewhat more maintained fork of ympd
   memento = qt6Packages.callPackage ../applications/video/memento { };
@@ -13616,9 +13616,9 @@ with pkgs;
     kreative-square
     ;
 
-  openscad = libsForQt5.callPackage ../applications/graphics/openscad { };
+  openscad = callPackage ../applications/graphics/openscad { };
 
-  opentoonz = libsForQt5.callPackage ../applications/graphics/opentoonz { };
+  opentoonz = callPackage ../applications/graphics/opentoonz { };
 
   opentx = libsForQt5.callPackage ../applications/misc/opentx { };
 
@@ -13675,9 +13675,9 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { };
+  photoflare = callPackage ../applications/graphics/photoflare { };
 
-  phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { };
+  phototonic = callPackage ../applications/graphics/phototonic { };
 
   pianobooster = qt5.callPackage ../applications/audio/pianobooster { };
 
@@ -13748,7 +13748,7 @@ with pkgs;
 
   qcad = libsForQt5.callPackage ../applications/misc/qcad { };
 
-  qcomicbook = libsForQt5.callPackage ../applications/graphics/qcomicbook { };
+  qcomicbook = callPackage ../applications/graphics/qcomicbook { };
 
   qctools = libsForQt5.callPackage ../applications/video/qctools { };
 
@@ -13782,7 +13782,7 @@ with pkgs;
 
   qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
 
-  qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { };
+  qimgv = callPackage ../applications/graphics/qimgv { };
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
@@ -13797,7 +13797,7 @@ with pkgs;
 
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
 
-  qscreenshot = libsForQt5.callPackage ../applications/graphics/qscreenshot { };
+  qscreenshot = callPackage ../applications/graphics/qscreenshot { };
 
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
@@ -13882,7 +13882,7 @@ with pkgs;
     wxGTK = wxGTK32;
   };
 
-  rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { };
+  rapid-photo-downloader = callPackage ../applications/graphics/rapid-photo-downloader { };
 
   rawtherapee = callPackage ../applications/graphics/rawtherapee {
     fftw = fftwSinglePrec;
@@ -13954,9 +13954,9 @@ with pkgs;
 
   sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
 
-  scantailor-advanced = libsForQt5.callPackage ../applications/graphics/scantailor/advanced.nix { };
+  scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { };
 
-  scantailor-universal = libsForQt5.callPackage ../applications/graphics/scantailor/universal.nix { };
+  scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
   scribus_1_5 = libsForQt5.callPackage ../applications/office/scribus/default.nix { };
   scribus = scribus_1_5;
@@ -14044,7 +14044,7 @@ with pkgs;
 
   skrooge = libsForQt5.callPackage ../applications/office/skrooge { };
 
-  smartdeblur = libsForQt5.callPackage ../applications/graphics/smartdeblur { };
+  smartdeblur = callPackage ../applications/graphics/smartdeblur { };
 
   soci = callPackage ../development/libraries/soci { };
 
@@ -14318,7 +14318,7 @@ with pkgs;
 
   vdirsyncer = with python3Packages; toPythonApplication vdirsyncer;
 
-  veusz = libsForQt5.callPackage ../applications/graphics/veusz { };
+  veusz = callPackage ../applications/graphics/veusz { };
 
   vim = vimUtils.makeCustomizable (
     callPackage ../applications/editors/vim {
@@ -16617,14 +16617,7 @@ with pkgs;
 
   qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
 
-  pick-colour-picker = python3Packages.callPackage ../applications/graphics/pick-colour-picker {
-    inherit
-      glib
-      gtk3
-      gobject-introspection
-      wrapGAppsHook3
-      ;
-  };
+  pick-colour-picker = callPackage ../applications/graphics/pick-colour-picker { };
 
   romdirfs = callPackage ../tools/filesystems/romdirfs {
     stdenv = gccStdenv;
@@ -16803,7 +16796,7 @@ with pkgs;
     SDL = SDL_sixel;
   };
 
-  yacreader = libsForQt5.callPackage ../applications/graphics/yacreader { };
+  yacreader = callPackage ../applications/graphics/yacreader { };
 
   yamale = with python3Packages; toPythonApplication yamale;