treewide: move to by-name part 4 (#522251)

pkgs/by-name/an/antimicrox/package.nix

@@ -6,9 +6,8 @@
   pkg-config,
   itstool,
   udevCheckHook,
-  wrapQtAppsHook,
   SDL2,
-  qttools,
+  libsForQt5,
   libxtst,
   fetchFromGitHub,
 }:
@@ -30,11 +29,11 @@ stdenv.mkDerivation rec {
     pkg-config
     itstool
     udevCheckHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     SDL2
-    qttools
+    libsForQt5.qttools
     libxtst
   ];
 

pkgs/by-name/aw/awesomebump/package.nix

@@ -2,13 +2,9 @@
   lib,
   stdenv,
   fetchgit,
-  qtbase,
-  qmake,
-  qtscript,
   flex,
   bison,
-  qtdeclarative,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -27,15 +23,15 @@ let
     sourceRoot = "${src.name}/Sources/utils/QtnProperty";
     patches = [ ./qtnproperty-parallel-building.patch ];
     buildInputs = [
-      qtscript
-      qtbase
-      qtdeclarative
+      libsForQt5.qtscript
+      libsForQt5.qtbase
+      libsForQt5.qtdeclarative
     ];
     nativeBuildInputs = [
-      qmake
+      libsForQt5.qmake
       flex
       bison
-      wrapQtAppsHook
+      libsForQt5.wrapQtAppsHook
     ];
     postInstall = ''
       install -D bin-linux/QtnPEG $out/bin/QtnPEG
@@ -49,14 +45,14 @@ stdenv.mkDerivation {
   inherit src;
 
   buildInputs = [
-    qtbase
-    qtscript
-    qtdeclarative
+    libsForQt5.qtbase
+    libsForQt5.qtscript
+    libsForQt5.qtdeclarative
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   preBuild = ''

pkgs/by-name/bf/bfcal/package.nix

@@ -5,8 +5,7 @@
   meson,
   ninja,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = {
@@ -36,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "bfcal";
     homepage = "https://git.sr.ht/~bitfehler/bfcal";
     license = lib.licenses.gpl3Plus;
-    platforms = qtbase.meta.platforms;
+    platforms = libsForQt5.qtbase.meta.platforms;
     maintainers = with lib.maintainers; [ laalsaas ];
   };
 })

pkgs/by-name/ca/cask-server/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   kdePackages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     kdePackages.extra-cmake-modules
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {

pkgs/by-name/ch/chewing-editor/package.nix

@@ -7,8 +7,6 @@
   pkg-config,
   libchewing,
   qt5,
-  qtbase,
-  qttools,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtest
     libchewing
-    qtbase
-    qttools
+    qt5.qtbase
+    qt5.qttools
   ];
 
   meta = {

pkgs/by-name/co/communi/package.nix

@@ -2,10 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  libcommuni,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -24,13 +21,13 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libcommuni
-    qtbase
+    libsForQt5.libcommuni
+    libsForQt5.qtbase
   ];
 
   # libCommuni.dylib is installed in $out/Applications/Communi.app/Contents/Frameworks/ on Darwin
@@ -39,7 +36,7 @@ stdenv.mkDerivation {
   dontWrapQtApps = stdenv.hostPlatform.isDarwin;
 
   preConfigure = ''
-    export QMAKEFEATURES=${libcommuni}/features
+    export QMAKEFEATURES=${libsForQt5.libcommuni}/features
   '';
 
   qmakeFlags = [

pkgs/by-name/co/confclerk/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,11 +14,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-GgWvPHcQnQrK9SOC8U9F2P8kuPCn8I2EhoWEEMtKBww=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   postInstall = ''

pkgs/by-name/co/coreboot-configurator/package.nix

@@ -14,9 +14,7 @@
   yaml-cpp,
   nvramtool,
   systemd,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -35,12 +33,12 @@ stdenv.mkDerivation {
     meson
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     yaml-cpp
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ];
 
   postPatch = ''

pkgs/by-name/cu/cura/package.nix

@@ -4,10 +4,7 @@
   fetchFromGitHub,
   cmake,
   python3,
-  wrapQtAppsHook,
-  qtbase,
-  qtquickcontrols2,
-  qtgraphicaleffects,
+  libsForQt5,
   curaengine,
   plugins ? [ ],
 }:
@@ -31,9 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ];
   propagatedBuildInputs =
     with python3.pkgs;
@@ -53,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     python3.pkgs.wrapPython
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/by-name/dd/ddcui/package.nix

@@ -4,9 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
+  libsForQt5,
   ddcutil,
 }:
 
@@ -26,12 +24,12 @@ stdenv.mkDerivation rec {
     # file is not currently written to support PREFIX installations.
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     ddcutil
   ];
 

pkgs/by-name/de/degate/package.nix

@@ -5,10 +5,7 @@
   fetchpatch,
   cmake,
   boost183,
-  qtbase,
-  qtimageformats,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -49,13 +46,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     boost_static
-    qtbase
+    libsForQt5.qtbase
   ];
 
   doCheck = true;
@@ -66,7 +63,7 @@ stdenv.mkDerivation rec {
       cd tests/out/bin
 
       # provide qtimageformats plugin to allow tests to read tiff files
-      export QT_PLUGIN_PATH="${qtimageformats}/${qtbase.qtPluginPrefix}"
+      export QT_PLUGIN_PATH="${libsForQt5.qtimageformats}/${libsForQt5.qtbase.qtPluginPrefix}"
 
       ./DegateTests
     )

pkgs/by-name/di/dialogbox/package.nix

@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,12 +17,12 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   installPhase = ''

pkgs/by-name/di/diffpdf/package.nix

@@ -3,11 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
-  qtbase,
-  poppler,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,17 +24,17 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.poppler
   ];
 
   preConfigure = ''
-    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${poppler.dev}
+    substituteInPlace diffpdf.pro --replace @@NIX_POPPLER_QT5@@ ${libsForQt5.poppler.dev}
     lrelease diffpdf.pro
   '';
 

pkgs/by-name/ds/dsview/package.nix

@@ -4,14 +4,11 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  wrapQtAppsHook,
   libzip,
   boost,
   fftw,
   libusb1,
-  qtbase,
-  qtsvg,
-  qtwayland,
+  libsForQt5,
   python3,
   desktopToDarwinBundle,
 }:
@@ -40,20 +37,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
   buildInputs = [
     boost
     fftw
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     libusb1
     libzip
     python3
   ]
-  ++ lib.optional stdenv.hostPlatform.isLinux qtwayland;
+  ++ lib.optional stdenv.hostPlatform.isLinux libsForQt5.qtwayland;
 
   doInstallCheck = true;
 

pkgs/by-name/ed/edb/package.nix

@@ -8,10 +8,7 @@
   capstone_4,
   double-conversion,
   graphviz,
-  qtxmlpatterns,
-  qttools,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   testers,
   nix-update-script,
 }:
@@ -31,17 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost.dev
     capstone_4
     double-conversion
     graphviz
-    qtxmlpatterns
+    libsForQt5.qtxmlpatterns
   ];
 
   cmakeFlags = [

pkgs/by-name/ei/eiskaltdcpp/package.nix

@@ -5,13 +5,9 @@
   fetchpatch2,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   bzip2,
   libx11,
-  qtbase,
-  qttools,
-  qtmultimedia,
-  qtscript,
+  libsForQt5,
   libiconv,
   pcre-cpp,
   libidn,
@@ -43,13 +39,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qttools
-    qtmultimedia
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtmultimedia
+    libsForQt5.qtscript
     bzip2
     libx11
     pcre-cpp

pkgs/by-name/ev/evtest-qt/package.nix

@@ -1,9 +1,8 @@
 {
   lib,
   stdenv,
-  qtbase,
   cmake,
-  wrapQtAppsHook,
+  libsForQt5,
   fetchFromGitHub,
   fetchpatch,
   unstableGitUpdater,
@@ -33,10 +32,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   passthru.updateScript = unstableGitUpdater { };
 

pkgs/by-name/g2/g2o/package.nix

@@ -3,14 +3,12 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
   eigen,
   suitesparse,
   blas,
   lapack,
   libGLU,
-  qtbase,
-  libqglviewer,
+  libsForQt5,
   spdlog,
 }:
 
@@ -36,7 +34,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     eigen
@@ -44,8 +42,8 @@ stdenv.mkDerivation rec {
     blas
     lapack
     libGLU
-    qtbase
-    libqglviewer
+    libsForQt5.qtbase
+    libsForQt5.libqglviewer
   ];
   propagatedBuildInputs = [ spdlog ];
 
@@ -53,7 +51,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     # Detection script is broken
-    "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer"
+    "-DQGLVIEWER_INCLUDE_DIR=${libsForQt5.libqglviewer}/include/QGLViewer"
     "-DG2O_BUILD_EXAMPLES=OFF"
   ]
   ++ lib.optionals stdenv.hostPlatform.isx86_64 [

pkgs/by-name/ge/gecode/package.nix

@@ -8,7 +8,7 @@
   perl,
   gmp,
   mpfr,
-  qtbase,
+  libsForQt5,
   enableGist ? true,
 }:
 
@@ -24,7 +24,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (import ./fix-const-weights-clang-patch.nix fetchpatch)
+    # https://github.com/Gecode/gecode/pull/74
+    (fetchpatch {
+      name = "fix-const-weights-clang.patch";
+      url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
+      sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
+    })
   ];
 
   enableParallelBuilding = true;
@@ -38,7 +43,7 @@ stdenv.mkDerivation rec {
     gmp
     mpfr
   ]
-  ++ lib.optional enableGist qtbase;
+  ++ lib.optional enableGist libsForQt5.qtbase;
 
   meta = {
     license = lib.licenses.mit;

pkgs/by-name/ge/gecode_3/package.nix

@@ -16,7 +16,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
-    (import ./fix-const-weights-clang-patch.nix fetchpatch)
+    # https://github.com/Gecode/gecode/pull/74
+    (fetchpatch {
+      name = "fix-const-weights-clang.patch";
+      url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
+      sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
+    })
   ];
 
   postPatch = ''

pkgs/by-name/ge/gede/package.nix

@@ -4,10 +4,7 @@
   fetchFromGitHub,
   makeWrapper,
   python3,
-  qtbase,
-  qmake,
-  qtserialport,
-  wrapQtAppsHook,
+  libsForQt5,
   ctags,
   gdb,
 }:
@@ -27,9 +24,9 @@ stdenv.mkDerivation rec {
     ctags
     makeWrapper
     python3
-    qmake
-    qtserialport
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qtserialport
+    libsForQt5.wrapQtAppsHook
   ];
 
   strictDeps = true;
@@ -41,7 +38,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     python build.py install --verbose --prefix="$out"
     wrapProgram $out/bin/gede \
-      --prefix QT_PLUGIN_PATH : ${qtbase}/${qtbase.qtPluginPrefix} \
+      --prefix QT_PLUGIN_PATH : ${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix} \
       --prefix PATH : ${
         lib.makeBinPath [
           ctags

pkgs/by-name/gl/glogg/package.nix

@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
   boost,
 }:
 
@@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [ boost ];
 

pkgs/by-name/go/googleearth-pro/package.nix

@@ -29,7 +29,7 @@
 
   xkeyboard-config,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 let
   arch =
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     dpkg
     makeWrapper
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   propagatedBuildInputs = [ xkeyboard-config ];
   buildInputs = [

pkgs/by-name/gu/guvcview/package.nix

@@ -19,8 +19,7 @@
   pulseaudioSupport ? config.pulseaudio or stdenv.hostPlatform.isLinux,
   libpulseaudio,
   useQt ? false,
-  qtbase ? null,
-  wrapQtAppsHook ? null,
+  libsForQt5,
   # can be turned off if used as a library
   useGtk ? true,
   gtk3,
@@ -42,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ]
   ++ lib.optionals useGtk [ wrapGAppsHook3 ]
-  ++ lib.optionals useQt [ wrapQtAppsHook ];
+  ++ lib.optionals useQt [ libsForQt5.wrapQtAppsHook ];
 
   buildInputs = [
     SDL2
@@ -59,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
   ++ lib.optionals useGtk [ gtk3 ]
   ++ lib.optionals useQt [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   configureFlags = [

pkgs/by-name/he/heimer/package.nix

@@ -4,9 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  wrapQtAppsHook,
-  qttools,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -36,12 +34,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qttools
-    qtbase
+    libsForQt5.qttools
+    libsForQt5.qtbase
   ];
 
   meta = {

pkgs/by-name/he/herqq/package.nix

@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtmultimedia,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -13,13 +10,13 @@ stdenv.mkDerivation rec {
   pname = "herqq";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
   outputs = [

pkgs/by-name/ho/hopper/package.nix

@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
   gnustep-libobjc,
   libbsd,
   libffi_3_3,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/by-name/hu/hue-plus/package.nix

@@ -2,8 +2,7 @@
   python3Packages,
   fetchFromGitHub,
   lib,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication {
@@ -18,9 +17,9 @@ python3Packages.buildPythonApplication {
     sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   propagatedBuildInputs = with python3Packages; [
     pyserial

pkgs/by-name/hy/hyperion-ng/package.nix

@@ -4,7 +4,7 @@
   fetchFromGitHub,
   cmake,
   gitMinimal,
-  wrapQtAppsHook,
+  libsForQt5,
   perl,
   flatbuffers,
   protobuf,
@@ -18,11 +18,6 @@
   libxcb,
   libxrandr,
   python3,
-  qtbase,
-  qtserialport,
-  qtsvg,
-  qtx11extras,
-  qtwebsockets,
   withRPiDispmanx ? false,
   libraspberrypi,
 }:
@@ -54,11 +49,11 @@ stdenv.mkDerivation rec {
     protobuf
     mbedtls
     python3
-    qtbase
-    qtserialport
-    qtsvg
-    qtwebsockets
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtserialport
+    libsForQt5.qtsvg
+    libsForQt5.qtwebsockets
+    libsForQt5.qtx11extras
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libcec
   ++ lib.optional withRPiDispmanx libraspberrypi;
@@ -66,7 +61,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     gitMinimal
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin perl; # for macos bundle
 

pkgs/by-name/i7/i7z/package.nix

@@ -5,7 +5,7 @@
   fetchpatch,
   ncurses,
   withGui ? false,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "00c4ng30ry88hcya4g1i9dngiqmz3cs31x7qh1a10nalxn1829xy";
   };
 
-  buildInputs = [ ncurses ] ++ lib.optional withGui qtbase;
+  buildInputs = [ ncurses ] ++ lib.optional withGui libsForQt5.qtbase;
 
   patches = [
     (fetchpatch {

pkgs/by-name/kr/kristall/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qmake,
-  qtmultimedia,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,11 +21,11 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qmake
   ];
 
-  buildInputs = [ qtmultimedia ];
+  buildInputs = [ libsForQt5.qtmultimedia ];
 
   qmakeFlags = [ "src/kristall.pro" ];
 
@@ -52,6 +50,6 @@ stdenv.mkDerivation rec {
     mainProgram = "kristall";
     homepage = "https://random-projects.net/projects/kristall.gemini";
     license = lib.licenses.gpl3Only;
-    inherit (qtmultimedia.meta) platforms;
+    inherit (libsForQt5.qtmultimedia.meta) platforms;
   };
 }

pkgs/by-name/kv/kvirc/package.nix

@@ -2,14 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qtx11extras,
   pkg-config,
   cmake,
   gettext,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -24,17 +20,17 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtsvg
+    libsForQt5.qtx11extras
   ];
 
   nativeBuildInputs = [
     pkg-config
     cmake
     gettext
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {

pkgs/by-name/li/linssid/package.nix

@@ -2,15 +2,11 @@
   lib,
   stdenv,
   fetchurl,
-  qtbase,
-  qtsvg,
-  qmake,
   pkg-config,
   boost,
   wirelesstools,
   iw,
-  qwt6_1,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,20 +20,20 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     boost
-    qwt6_1
+    libsForQt5.qwt6_1
   ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
   postPatch = ''
-    sed -e "s|/usr/include/qt5.*$|& ${qwt6_1}/include|" -i linssid-app/linssid-app.pro
+    sed -e "s|/usr/include/qt5.*$|& ${libsForQt5.qwt6_1}/include|" -i linssid-app/linssid-app.pro
     sed -e "s|/usr/include/|/nonexistent/|g" -i linssid-app/*.pro
     sed -e 's|^LIBS .*= .*libboost_regex.a|LIBS += -lboost_regex|' \
         -e "s|/usr|$out|g" \

pkgs/by-name/lo/loganalyzer/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   sourceRoot = "${src.name}/src";

pkgs/by-name/ly/lyx/package.nix

@@ -6,9 +6,7 @@
   python3,
   file,
   bc,
-  qtbase,
-  wrapQtAppsHook,
-  qtsvg,
+  libsForQt5,
   hunspell,
   makeWrapper, # , mythes, boost
 }:
@@ -27,12 +25,12 @@ stdenv.mkDerivation rec {
     pkg-config
     makeWrapper
     python3
-    qtbase
-    wrapQtAppsHook
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     file # for libmagic
     bc
     hunspell # enchant

pkgs/by-name/ma/makehuman/package.nix

@@ -3,9 +3,8 @@
   lib,
   fetchFromGitHub,
   python3,
-  qtbase,
   git-lfs,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 let
@@ -45,14 +44,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     python
-    qtbase
+    libsForQt5.qtbase
     git-lfs
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     python
-    qtbase
+    libsForQt5.qtbase
   ];
 
   propagatedBuildInputs = pydeps;

pkgs/by-name/ma/maliit-framework/package.nix

@@ -4,8 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
 
-  qtbase,
-
   at-spi2-atk,
   at-spi2-core,
   libepoxy,
@@ -25,7 +23,7 @@
   pkg-config,
   wayland-protocols,
   wayland-scanner,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -61,11 +59,11 @@ stdenv.mkDerivation {
     pkg-config
     wayland-protocols
     wayland-scanner
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
-    "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${qtbase.qtPluginPrefix}"
+    "-DQT5_PLUGINS_INSTALL_DIR=${placeholder "out"}/${libsForQt5.qtbase.qtPluginPrefix}"
   ];
 
   meta = {

pkgs/by-name/ma/maliit-keyboard/package.nix

@@ -8,15 +8,11 @@
   libchewing,
   libpinyin,
   maliit-framework,
-  qtfeedback,
-  qtmultimedia,
-  qtquickcontrols2,
-  qtgraphicaleffects,
 
   cmake,
   pkg-config,
   wrapGAppsHook3,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -41,10 +37,10 @@ stdenv.mkDerivation {
     libchewing
     libpinyin
     maliit-framework
-    qtfeedback
-    qtmultimedia
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtfeedback
+    libsForQt5.qtmultimedia
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ];
 
   cmakeFlags = [
@@ -56,7 +52,7 @@ stdenv.mkDerivation {
     cmake
     pkg-config
     wrapGAppsHook3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   postInstall = ''

pkgs/by-name/mi/michabo/package.nix

@@ -3,11 +3,7 @@
   stdenv,
   makeDesktopItem,
   fetchFromGitLab,
-  qmake,
-  wrapQtAppsHook,
-  # qt
-  qtbase,
-  qtwebsockets,
+  libsForQt5,
 }:
 
 let
@@ -31,12 +27,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtwebsockets
+    libsForQt5.qtbase
+    libsForQt5.qtwebsockets
   ];
 
   qmakeFlags = [

pkgs/by-name/my/mythtv/package.nix

@@ -3,8 +3,6 @@
   stdenv,
   fetchFromGitHub,
   which,
-  qtbase,
-  qtscript,
   libpulseaudio,
   fftwSinglePrec,
   lame,
@@ -32,7 +30,7 @@
   autoconf,
   automake,
   file,
-  wrapQtAppsHook,
+  libsForQt5,
   exiv2,
   linuxHeaders,
   soundtouch,
@@ -60,8 +58,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     freetype
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
     lame
     zlib
     libGLU
@@ -96,7 +94,7 @@ stdenv.mkDerivation rec {
     autoconf
     automake
     file
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   configureFlags = [ "--dvb-path=${linuxHeaders}/include" ];

pkgs/by-name/na/nano-wallet/package.nix

@@ -5,10 +5,9 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   boost,
   libGL,
-  qtbase,
+  libsForQt5,
   python3,
 }:
 
@@ -43,10 +42,10 @@ stdenv.mkDerivation (finalAttrs: {
         BOOST_ROOT = boost;
         RAIBLOCKS_GUI = "ON";
         RAIBLOCKS_TEST = "ON";
-        Qt5_DIR = "${qtbase.dev}/lib/cmake/Qt5";
-        Qt5Core_DIR = "${qtbase.dev}/lib/cmake/Qt5Core";
-        Qt5Gui_INCLUDE_DIRS = "${qtbase.dev}/include/QtGui";
-        Qt5Widgets_INCLUDE_DIRS = "${qtbase.dev}/include/QtWidgets";
+        Qt5_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5";
+        Qt5Core_DIR = "${libsForQt5.qtbase.dev}/lib/cmake/Qt5Core";
+        Qt5Gui_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtGui";
+        Qt5Widgets_INCLUDE_DIRS = "${libsForQt5.qtbase.dev}/include/QtWidgets";
       };
       optionToFlag = name: value: "-D${name}=${value}";
     in
@@ -55,12 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     boost
     libGL
-    qtbase
+    libsForQt5.qtbase
   ];
 
   strictDeps = true;

pkgs/by-name/na/natron/package.nix

@@ -5,7 +5,7 @@
   fetchpatch,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   boost,
   cairo,
   ceres-solver,
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
     cmake
     kdePackages.extra-cmake-modules
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [

pkgs/by-name/ni/nifskope/package.nix

@@ -2,13 +2,10 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qttools,
   replaceVars,
   libGLU,
   zlib,
-  wrapQtAppsHook,
+  libsForQt5,
   fetchpatch,
 }:
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation {
     ./external-lib-paths.patch
     ./zlib.patch
     (replaceVars ./qttools-bins.patch {
-      qttools = "${qttools.dev}/bin";
+      qttools = "${libsForQt5.qttools.dev}/bin";
     })
     (fetchpatch {
       name = "qt512-build-fix.patch";
@@ -39,14 +36,14 @@ stdenv.mkDerivation {
   ++ (lib.optional stdenv.hostPlatform.isAarch64 ./no-sse-on-arm.patch);
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libGLU
     zlib
   ];
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   preConfigure = ''

pkgs/by-name/ni/nitrokey-app/package.nix

@@ -4,10 +4,9 @@
   cmake,
   fetchFromGitHub,
   pkg-config,
-  wrapQtAppsHook,
+  libsForQt5,
   libnitrokey,
   cppcodec,
-  qttools,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,8 +23,8 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   cmakeFlags = [

pkgs/by-name/nv/nvidia-system-monitor-qt/package.nix

@@ -3,8 +3,7 @@
   lib,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
   makeDesktopItem,
   copyDesktopItems,
 }:
@@ -35,10 +34,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-JHK7idyk5UxgDyt+SzvYjTLmlNzx6+Z+OPYsRD4NWPg=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     copyDesktopItems
   ];
 

pkgs/by-name/op/openambit/package.nix

@@ -6,9 +6,7 @@
   lib,
   libusb1,
   python3,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   udev,
   zlib,
 }:
@@ -49,13 +47,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libusb1
     python3
-    qtbase
+    libsForQt5.qtbase
     udev
     zlib
   ];

pkgs/by-name/op/openbrf/package.nix

@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   vcg,
   glew,
   libGLU,
@@ -34,12 +32,12 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     vcg
     glew
     eigen
@@ -61,7 +59,7 @@ stdenv.mkDerivation {
     patchelf  \
       --set-rpath "${
         lib.makeLibraryPath [
-          qtbase
+          libsForQt5.qtbase
           glew
           stdenv.cc.cc
           libGLU

pkgs/by-name/op/opentx/package.nix

@@ -5,11 +5,8 @@
   cmake,
   gcc-arm-embedded,
   python3Packages,
-  qttools,
   udevCheckHook,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
+  libsForQt5,
   SDL,
   gtest,
   dfu-util,
@@ -35,14 +32,14 @@ stdenv.mkDerivation rec {
     cmake
     gcc-arm-embedded
     python3Packages.pillow
-    qttools
+    libsForQt5.qttools
     udevCheckHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     SDL
   ];
 

pkgs/by-name/pr/projecteur/package.nix

@@ -4,9 +4,7 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  qtbase,
-  qtgraphicaleffects,
-  wrapQtAppsHook,
+  libsForQt5,
   udevCheckHook,
   versionCheckHook,
 }:
@@ -24,14 +22,14 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtbase
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qtgraphicaleffects
   ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     udevCheckHook
   ];
 

pkgs/by-name/pu/pulseview/package.nix

@@ -15,10 +15,8 @@
   glibmm,
   pcre,
   python3,
-  qtsvg,
-  qttools,
   bluez,
-  wrapQtAppsHook,
+  libsForQt5,
   desktopToDarwinBundle,
 }:
 
@@ -36,8 +34,8 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
 
@@ -53,7 +51,7 @@ stdenv.mkDerivation {
     glibmm
     pcre
     python3
-    qtsvg
+    libsForQt5.qtsvg
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 

pkgs/by-name/pu/pure-maps/package.nix

@@ -3,16 +3,10 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qttools,
-  wrapQtAppsHook,
-  qtquickcontrols2,
-  qtlocation,
-  qtsensors,
+  libsForQt5,
   nemo-qml-plugin-dbus,
-  mapbox-gl-qml,
   s2geometry,
   python3,
-  pyotherside,
 }:
 
 stdenv.mkDerivation rec {
@@ -30,18 +24,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     python3
-    qttools
+    libsForQt5.qttools
     python3.pkgs.wrapPython
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtquickcontrols2
-    qtlocation
-    qtsensors
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtlocation
+    libsForQt5.qtsensors
     nemo-qml-plugin-dbus
-    pyotherside
-    mapbox-gl-qml
+    libsForQt5.pyotherside
+    libsForQt5.mapbox-gl-qml
     s2geometry
   ];
 

pkgs/by-name/qa/qarte/package.nix

@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchbzr,
-  wrapQtAppsHook,
+  libsForQt5,
   python3,
   rtmpdump,
 }:
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
     sha256 = "sha256-+Ixe4bWKubH/XBESwmP2NWS8bH0jq611c3MZn7W87Jw=";
   };
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  nativeBuildInputs = [ libsForQt5.wrapQtAppsHook ];
 
   buildInputs = [ pythonEnv ];
 

pkgs/by-name/qb/qbs/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtscript,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-nL7UZh29Oecu3RvXYg5xsin2IvPWpApleLH37sEdSAI=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ libsForQt5.qmake ];
 
   dontWrapQtApps = true;
 
@@ -29,8 +27,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   meta = {

pkgs/by-name/qc/qctools/package.nix

@@ -2,11 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  qmake,
-  wrapQtAppsHook,
   ffmpeg_6,
-  qtmultimedia,
-  qwt,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -21,14 +18,14 @@ stdenv.mkDerivation rec {
   sourceRoot = "${pname}/Project/QtCreator";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     ffmpeg_6
-    qtmultimedia
-    qwt
+    libsForQt5.qtmultimedia
+    libsForQt5.qwt
   ];
 
   installPhase = ''

pkgs/by-name/qf/qFlipper/package.nix

@@ -6,20 +6,9 @@
   zlib,
   libusb1,
   libGL,
-  qmake,
   wrapGAppsHook3,
-  wrapQtAppsHook,
 
-  qttools,
-  qtbase,
-  qt3d,
-  qtsvg,
-  qtserialport,
-  qtdeclarative,
-  qtquickcontrols,
-  qtquickcontrols2,
-  qtgraphicaleffects,
-  qtwayland,
+  libsForQt5,
   nix-update-script,
 }:
 let
@@ -43,10 +32,10 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     wrapGAppsHook3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -54,17 +43,17 @@ stdenv.mkDerivation {
     libusb1
     libGL
 
-    qtbase
-    qt3d
-    qtsvg
-    qtserialport
-    qtdeclarative
-    qtquickcontrols
-    qtquickcontrols2
-    qtgraphicaleffects
+    libsForQt5.qtbase
+    libsForQt5.qt3d
+    libsForQt5.qtsvg
+    libsForQt5.qtserialport
+    libsForQt5.qtdeclarative
+    libsForQt5.qtquickcontrols
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qtgraphicaleffects
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-    qtwayland
+    libsForQt5.qtwayland
   ];
 
   qmakeFlags = [

pkgs/by-name/qj/qjoypad/package.nix

@@ -4,12 +4,9 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  qttools,
-  wrapQtAppsHook,
   libx11,
   libxtst,
-  qtbase,
-  qtx11extras,
+  libsForQt5,
 }:
 stdenv.mkDerivation rec {
   pname = "qjoypad";
@@ -30,14 +27,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkg-config
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libx11
     libxtst
-    qtbase
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
   ];
 
   meta = {

pkgs/by-name/qp/qpdfview/package.nix

@@ -2,13 +2,8 @@
   lib,
   stdenv,
   fetchurl,
-  qmake,
-  qttools,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
-  poppler,
+  libsForQt5,
   djvulibre,
   libspectre,
   cups,
@@ -26,16 +21,16 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    poppler
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
+    libsForQt5.poppler
     djvulibre
     libspectre
     cups

pkgs/by-name/qs/qsudo/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   sudo,
 }:
 
@@ -22,12 +20,12 @@ stdenv.mkDerivation rec {
   sourceRoot = "${src.name}/src-qt5";
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     sudo
   ];
 

pkgs/by-name/qt/qt-box-editor/package.nix

@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
+  libsForQt5,
   leptonica,
   tesseract4,
 }:
@@ -22,13 +19,13 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     leptonica
     tesseract4
   ];

pkgs/by-name/qt/qtemu/package.nix

@@ -3,9 +3,7 @@
   stdenv,
   fetchFromGitLab,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   qemu,
 }:
 
@@ -21,13 +19,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     qemu
   ];
 

pkgs/by-name/qt/qtspim/package.nix

@@ -2,10 +2,7 @@
   lib,
   stdenv,
   fetchsvn,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  qmake,
+  libsForQt5,
   bison,
   flex,
 }:
@@ -24,7 +21,7 @@ stdenv.mkDerivation {
 
     substituteInPlace QtSpim.pro --replace /usr/lib/qtspim/lib $out/lib
     substituteInPlace menu.cpp \
-      --replace /usr/lib/qtspim/bin/assistant ${qttools.dev}/bin/assistant \
+      --replace /usr/lib/qtspim/bin/assistant ${libsForQt5.qttools.dev}/bin/assistant \
       --replace /usr/lib/qtspim/help/qtspim.qhc $out/share/help/qtspim.qhc
     substituteInPlace ../Setup/qtspim_debian_deployment/qtspim.desktop \
       --replace /usr/bin/qtspim qtspim \
@@ -32,14 +29,14 @@ stdenv.mkDerivation {
   '';
 
   nativeBuildInputs = [
-    wrapQtAppsHook
-    qttools
-    qmake
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.qmake
     bison
     flex
   ];
-  buildInputs = [ qtbase ];
-  env.QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}";
+  buildInputs = [ libsForQt5.qtbase ];
+  env.QT_PLUGIN_PATH = "${libsForQt5.qtbase}/${libsForQt5.qtbase.qtPluginPrefix}";
 
   qmakeFlags = [
     "QtSpim.pro"

pkgs/by-name/qu/quassel/package.nix

@@ -10,14 +10,11 @@
   fetchFromGitHub,
   cmake,
   makeWrapper,
-  wrapQtAppsHook,
   dconf,
-  qtbase,
   boost,
   zlib,
-  qtscript,
   libdbusmenu,
-  qca-qt5,
+  libsForQt5,
   openldap,
 }:
 
@@ -51,15 +48,15 @@ stdenv.mkDerivation rec {
     cmake
     makeWrapper
   ]
-  ++ lib.optional buildClient wrapQtAppsHook;
+  ++ lib.optional buildClient libsForQt5.wrapQtAppsHook;
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost
     zlib
   ]
   ++ lib.optionals buildCore [
-    qtscript
-    qca-qt5
+    libsForQt5.qtscript
+    libsForQt5.qca-qt5
     openldap
   ]
   ++ lib.optionals buildClient [
@@ -80,7 +77,7 @@ stdenv.mkDerivation rec {
 
   postFixup =
     lib.optionalString enableDaemon ''
-      wrapProgram "$out/bin/quasselcore" --suffix PATH : "${qtbase.bin}/bin"
+      wrapProgram "$out/bin/quasselcore" --suffix PATH : "${libsForQt5.qtbase.bin}/bin"
     ''
     + lib.optionalString buildClient ''
       wrapQtApp "$out/bin/quassel${lib.optionalString client "client"}" \
@@ -106,6 +103,6 @@ stdenv.mkDerivation rec {
         "quasselclient"
       else
         "quasselcore";
-    inherit (qtbase.meta) platforms;
+    inherit (libsForQt5.qtbase.meta) platforms;
   };
 }

pkgs/by-name/qx/qxmledit/package.nix

@@ -2,11 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtxmlpatterns,
-  qtsvg,
-  qtscxml,
+  libsForQt5,
   libGLU,
 }:
 
@@ -26,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-UzN5U+aC/uKokSdeUG2zv8+mkaH4ndYZ0sfzkpQ3l1M=";
   };
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [ libsForQt5.qmake ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtscxml
+    libsForQt5.qtbase
+    libsForQt5.qtxmlpatterns
+    libsForQt5.qtsvg
+    libsForQt5.qtscxml
     libGLU
   ];
 

pkgs/by-name/r3/r3ctl/package.nix

@@ -2,10 +2,6 @@
   stdenv,
   lib,
   qt5,
-  qtbase,
-  qttools,
-  qtwebsockets,
-  qtmultimedia,
   fetchFromGitHub,
 }:
 
@@ -34,10 +30,10 @@ stdenv.mkDerivation {
   ];
 
   buildInputs = [
-    qtbase
-    qttools
-    qtmultimedia
-    qtwebsockets
+    qt5.qtbase
+    qt5.qttools
+    qt5.qtmultimedia
+    qt5.qtwebsockets
   ];
 
   meta = {

pkgs/by-name/re/recoll/package.nix

@@ -29,9 +29,7 @@
   pkg-config,
   poppler-utils,
   python3Packages,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   unrtf,
   untex,
   unzip,
@@ -120,11 +118,11 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optionals withGui [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ]
   ++ lib.optionals withPython [
     python3Packages.setuptools
@@ -145,7 +143,7 @@ stdenv.mkDerivation rec {
     file
   ]
   ++ lib.optionals withGui [
-    qtbase
+    libsForQt5.qtbase
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

pkgs/by-name/re/rescuetime/package.nix

@@ -3,7 +3,6 @@
   lib,
   fetchurl,
   dpkg,
-  wrapQtAppsHook,
   patchelf,
   qt5,
   libxtst,
@@ -39,7 +38,7 @@ stdenv.mkDerivation rec {
   inherit src;
   nativeBuildInputs = [
     dpkg
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   # avoid https://github.com/NixOS/patchelf/issues/99
   dontStrip = true;

pkgs/by-name/re/retroshare/package.nix

@@ -3,10 +3,8 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
-  qmake,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
   miniupnpc,
   bzip2,
   speex,
@@ -16,9 +14,7 @@
   sqlcipher,
   rapidjson,
   libxscrnsaver,
-  qtbase,
-  qtx11extras,
-  qtmultimedia,
+  libsForQt5,
   libgnome-keyring,
 }:
 
@@ -50,16 +46,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     speex
     miniupnpc
-    qtmultimedia
-    qtx11extras
-    qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtx11extras
+    libsForQt5.qtbase
     libgnome-keyring
     bzip2
     libxscrnsaver

pkgs/by-name/ro/rocket/package.nix

@@ -2,9 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   dontConfigure = true;
 

pkgs/by-name/se/seer/package.nix

@@ -5,7 +5,6 @@
   cmake,
   gdb,
   kdePackages,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation rec {

pkgs/by-name/si/simplescreenrecorder/package.nix

@@ -8,7 +8,6 @@
   libx11,
   libxext,
   libxinerama,
-  qtx11extras,
   libxfixes,
   libGLU,
   libGL,
@@ -16,9 +15,7 @@
   libpulseaudio,
   libv4l,
   pipewire,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
   cmake,
   ninja,
   unstableGitUpdater,
@@ -53,7 +50,7 @@ stdenv.mkDerivation {
     pkg-config
     cmake
     ninja
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -69,9 +66,9 @@ stdenv.mkDerivation {
     libpulseaudio
     libv4l
     pipewire
-    qtbase
-    qttools
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
   ];
 
   passthru.updateScript = unstableGitUpdater { };

pkgs/by-name/tw/twinkle/package.nix

@@ -11,14 +11,11 @@
   flex,
   ucommon,
   ccrtp,
-  qtbase,
-  qttools,
-  qtquickcontrols2,
   alsa-lib,
   speex,
   ilbc,
   bcg729,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,9 +36,9 @@ stdenv.mkDerivation rec {
     readline
     ucommon
     ccrtp
-    qtbase
-    qttools
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtquickcontrols2
     alsa-lib
     speex
     ilbc
@@ -52,7 +49,7 @@ stdenv.mkDerivation rec {
     bison
     flex
     bcg729
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [

pkgs/by-name/tw/twmn/package.nix

@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
   boost,
 }:
 
@@ -22,11 +20,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     boost
   ];
 

pkgs/by-name/un/unigine-superposition/package.nix

@@ -6,7 +6,7 @@
   freetype,
   fontconfig,
   zlib,
-  qtquickcontrols2,
+  libsForQt5,
   libxinerama,
   libxcb,
   libsm,
@@ -51,7 +51,7 @@ let
       freetype
       fontconfig
       zlib
-      qtquickcontrols2
+      libsForQt5.qtquickcontrols2
       libxinerama
       libxcb
       libsm
@@ -108,7 +108,7 @@ buildFHSEnv {
     freetype
     fontconfig
     zlib
-    qtquickcontrols2
+    libsForQt5.qtquickcontrols2
     libxinerama
     libxcb
     libsm

pkgs/by-name/va/valentina/package.nix

@@ -3,11 +3,7 @@
   stdenv,
   fetchFromGitLab,
   installShellFiles,
-  qmake,
-  qttools,
-  qtsvg,
-  qtxmlpatterns,
-  wrapQtAppsHook,
+  libsForQt5,
   autoPatchelfHook,
 }:
 
@@ -24,20 +20,20 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/app/translations.pri \
-      --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev qttools}/bin/lrelease'
+      --replace '$$[QT_INSTALL_BINS]/$$LRELEASE' '${lib.getDev libsForQt5.qttools}/bin/lrelease'
   '';
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
     installShellFiles
     autoPatchelfHook
   ];
 
   buildInputs = [
-    qtsvg
-    qtxmlpatterns
+    libsForQt5.qtsvg
+    libsForQt5.qtxmlpatterns
   ];
 
   qmakeFlags = [

pkgs/by-name/xf/xflr5/package.nix

@@ -2,8 +2,7 @@
   lib,
   stdenv,
   fetchsvn,
-  qmake,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -18,8 +17,8 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   meta = {

pkgs/by-name/zb/zbar/package.nix

@@ -8,10 +8,7 @@
   withXorg ? true,
   libx11,
   libv4l,
-  qtbase,
-  qtwayland,
-  qtx11extras,
-  wrapQtAppsHook,
+  libsForQt5,
   wrapGAppsHook3,
   gtk3,
   xmlto,
@@ -77,8 +74,8 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals enableVideo [
     wrapGAppsHook3
-    wrapQtAppsHook
-    qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtbase
   ];
 
   buildInputs = [
@@ -97,9 +94,9 @@ stdenv.mkDerivation rec {
   ++ lib.optionals enableVideo [
     libv4l
     gtk3
-    qtbase
-    qtwayland
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qtwayland
+    libsForQt5.qtx11extras
   ];
 
   nativeCheckInputs = [

pkgs/development/libraries/gecode/fix-const-weights-clang-patch.nix

@@ -1,7 +0,0 @@
-fetchpatch:
-# https://github.com/Gecode/gecode/pull/74
-(fetchpatch {
-  name = "fix-const-weights-clang.patch";
-  url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch";
-  sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc";
-})