From e9128a3436da0cd89608092db9a10430b06b667f Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Fri, 27 May 2022 02:29:59 +0200 Subject: [PATCH 1/3] qt6.wrapQtAppsHook: remove dependencies: qtbase qtwayland qt6 gui apps: buildInputs: qtbase qtwayland qt6 cli apps: buildInputs: qtbase --- pkgs/development/libraries/qt-6/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index 231c82cf6e76..5dbb241c6c5e 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/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; }; From b818b6c696d0c5c173c5154705f586cc5c384060 Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Fri, 27 May 2022 15:41:02 +0200 Subject: [PATCH 2/3] tdesktop: add dependency: qtwayland --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index df86ccd062bb..f871b610a41a 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/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 From 784a63333c2fdbf0c11aa7beac1455c8fd0392ca Mon Sep 17 00:00:00 2001 From: Milan Hauth Date: Fri, 27 May 2022 15:42:16 +0200 Subject: [PATCH 3/3] cutemaze: add dependencies: qtbase qtwayland --- pkgs/games/cutemaze/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index f33ad0c876e9..ae6ade155f25 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/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