diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index 551f8e57f7a0..a9182b739fbf 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchurl
 , cups
 , libssh
@@ -15,7 +16,7 @@
 , pkg-config
 }:
 
-qt5.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "x2goclient";
   version = "4.1.2.2";
 
diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix
index fb930edd1447..69f7b4d153c5 100644
--- a/pkgs/applications/networking/synology-drive-client/default.nix
+++ b/pkgs/applications/networking/synology-drive-client/default.nix
@@ -25,7 +25,7 @@ let
     update-source-version synology-drive-client "$version"
   '';
 
-  linux = qt5.mkDerivation {
+  linux = stdenv.mkDerivation {
     inherit pname version meta passthru;
 
     src = fetchurl {
@@ -33,7 +33,7 @@ let
       sha256 = "sha256-VeS5bPcMM4JDCSH5GXkl4OgQjrPKaNDh5PfX28/zqaU=";
     };
 
-    nativeBuildInputs = [ autoPatchelfHook dpkg ];
+    nativeBuildInputs = [ qt5.wrapQtAppsHook autoPatchelfHook dpkg ];
 
     buildInputs = [ glibc gtk3 pango libxcb ];
 
diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index 7686ec3f13f9..485cce459958 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -1,6 +1,6 @@
-{ cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }:
+{ stdenv, cmake, extra-cmake-modules, fetchFromGitLab, lib, libsForQt5 }:
 
-libsForQt5.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kgeotag";
   version = "1.6.0";
 
@@ -12,7 +12,7 @@ libsForQt5.mkDerivation rec {
     hash = "sha256-lUfU6SHRCglC81BTcVFFOp/psWXsUFOTEPUrZutrJaY=";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules ];
+  nativeBuildInputs = [ cmake extra-cmake-modules libsForQt5.wrapQtAppsHook ];
 
   buildInputs = [ libsForQt5.libkexiv2 libsForQt5.marble ];
 
diff --git a/pkgs/by-name/ne/neovim-qt/package.nix b/pkgs/by-name/ne/neovim-qt/package.nix
index 6251559eba27..c94c47720106 100644
--- a/pkgs/by-name/ne/neovim-qt/package.nix
+++ b/pkgs/by-name/ne/neovim-qt/package.nix
@@ -1,12 +1,12 @@
-{ stdenv, libsForQt5, makeWrapper, neovim, neovim-qt-unwrapped }:
+{ stdenvNoCC, makeWrapper, neovim, neovim-qt-unwrapped }:
 
 let
   unwrapped = neovim-qt-unwrapped;
 in
-libsForQt5.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "neovim-qt";
   version = unwrapped.version;
-  buildCommand = if stdenv.hostPlatform.isDarwin then ''
+  buildCommand = if stdenvNoCC.hostPlatform.isDarwin then ''
     mkdir -p $out/Applications
     cp -r ${unwrapped}/bin/nvim-qt.app $out/Applications
 
diff --git a/pkgs/by-name/os/oscar/package.nix b/pkgs/by-name/os/oscar/package.nix
index 1af7233bb20a..cdc9c267327d 100644
--- a/pkgs/by-name/os/oscar/package.nix
+++ b/pkgs/by-name/os/oscar/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitLab,
   libGLU,
 }:
-qt5.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "oscar";
   version = "1.5.1";
 
@@ -22,7 +22,10 @@ qt5.mkDerivation rec {
     qt5.qtserialport
     libGLU
   ];
-  nativeBuildInputs = [ qt5.qmake ];
+  nativeBuildInputs = [
+    qt5.wrapQtAppsHook
+    qt5.qmake
+  ];
   postPatch = ''
     substituteInPlace oscar/oscar.pro --replace "/bin/bash" "${stdenv.shell}"
   '';
diff --git a/pkgs/by-name/qd/qdirstat/package.nix b/pkgs/by-name/qd/qdirstat/package.nix
index e933cafc2e80..04e6ae824f22 100644
--- a/pkgs/by-name/qd/qdirstat/package.nix
+++ b/pkgs/by-name/qd/qdirstat/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  stdenv,
   libsForQt5,
   coreutils,
   xdg-utils,
@@ -9,7 +10,7 @@
   perlPackages,
 }:
 
-libsForQt5.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qdirstat";
   version = "1.9";
 
@@ -20,7 +21,12 @@ libsForQt5.mkDerivation rec {
     hash = "sha256-pwdmltHDNwUMx1FNOoiXl5Pna0zlKqahmicBCN6UVSU=";
   };
 
-  nativeBuildInputs = [ makeWrapper ] ++ (with libsForQt5; [ qmake ]);
+  nativeBuildInputs =
+    [ makeWrapper ]
+    ++ (with libsForQt5; [
+      qmake
+      wrapQtAppsHook
+    ]);
 
   buildInputs = [ perlPackages.perl ];
 
diff --git a/pkgs/by-name/so/soundwireserver/package.nix b/pkgs/by-name/so/soundwireserver/package.nix
index 1d04e48129d5..06a93d90af00 100644
--- a/pkgs/by-name/so/soundwireserver/package.nix
+++ b/pkgs/by-name/so/soundwireserver/package.nix
@@ -1,12 +1,13 @@
 {
   lib,
+  stdenvNoCC,
   qt5,
   autoPatchelfHook,
   fetchzip,
   portaudio,
 }:
 
-qt5.mkDerivation {
+stdenvNoCC.mkDerivation {
   pname = "soundwire";
   version = "3.0";
 
@@ -17,6 +18,7 @@ qt5.mkDerivation {
 
   nativeBuildInputs = [
     autoPatchelfHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/tools/misc/r3ctl/default.nix b/pkgs/tools/misc/r3ctl/default.nix
index bc0c7837e2a9..df2665dfcf7b 100644
--- a/pkgs/tools/misc/r3ctl/default.nix
+++ b/pkgs/tools/misc/r3ctl/default.nix
@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , qt5
 , qtbase
 , qttools
@@ -7,7 +8,7 @@
 , fetchFromGitHub
 }:
 
-qt5.mkDerivation {
+stdenv.mkDerivation {
   pname = "r3ctl";
   version = "a82cb5b3123224e706835407f21acea9dc7ab0f0";