swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
qt6.wrapQtAppsHook: remove dependencies: qtbase qtwayland
This commit is contained in:
Sandro 2022-05-30 23:46:18 +02:00 committed by GitHub
parent 38083555c3 784a63333c
commit 765a6aba57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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

5
pkgs/development/libraries/qt-6/default.nix
View file

@ -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;
};

8
pkgs/games/cutemaze/default.nix
View file

@ -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