Merge pull request #174946 from milahu/qt6-wrapQtAppsHook-remove-qtwayland

qt6.wrapQtAppsHook: remove dependencies: qtbase qtwayland

pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix

@@ -9,6 +9,7 @@
 , wrapQtAppsHook
 , extra-cmake-modules
 , qtbase
+, qtwayland
 , qtsvg
 , qtimageformats
 , qt5compat
@@ -112,6 +113,7 @@ env.mkDerivation rec {
 
   buildInputs = [
     qtbase
+    qtwayland
     qtsvg
     qtimageformats
     qt5compat

pkgs/development/libraries/qt-6/default.nix

@@ -83,9 +83,8 @@ let
       qtwebsockets = callPackage ./modules/qtwebsockets.nix { };
       qtwebview = callPackage ./modules/qtwebview.nix { };
 
-      wrapQtAppsHook = makeSetupHook
-        {
-          deps = [ self.qtbase.dev self.qtwayland.dev makeWrapper ];
+      wrapQtAppsHook = makeSetupHook {
+          deps = [ makeWrapper ];
         } ./hooks/wrap-qt-apps-hook.sh;
     };
 

pkgs/games/cutemaze/default.nix

@@ -4,6 +4,8 @@
 , cmake
 , qttools
 , wrapQtAppsHook
+, qtbase
+, qtwayland
 , qtsvg
 }:
 
@@ -22,7 +24,11 @@ stdenv.mkDerivation rec {
     wrapQtAppsHook
   ];
 
-  buildInputs = [ qtsvg ];
+  buildInputs = [
+    qtbase
+    qtwayland
+    qtsvg
+  ];
 
   postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/Applications