Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cmake: add wrapQtAppsHook #127743

Merged
merged 1 commit into from
Jul 8, 2021
Merged

cmake: add wrapQtAppsHook #127743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkgs/development/tools/build-managers/cmake/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
, useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin)
, useOpenSSL ? !isBootstrap, openssl
, useNcurses ? false, ncurses
, withQt5 ? false, qtbase
, withQt5 ? false, qtbase, wrapQtAppsHook
, buildDocs ? (!isBootstrap && (useNcurses || withQt5)), sphinx, texinfo
}:

stdenv.mkDerivation (rec {
stdenv.mkDerivation rec {
pname = "cmake"
+ lib.optionalString isBootstrap "-boot"
+ lib.optionalString useNcurses "-cursesUI"
Expand Down Expand Up @@ -45,7 +45,8 @@ stdenv.mkDerivation (rec {
depsBuildBuild = [ buildPackages.stdenv.cc ];

nativeBuildInputs = [ setupHook pkg-config ]
++ lib.optionals buildDocs [ texinfo ];
++ lib.optionals buildDocs [ texinfo ]
++ lib.optionals withQt5 [ wrapQtAppsHook ];

buildInputs = []
++ lib.optionals useSharedLibraries [ bzip2 curlMinimal expat libarchive xz zlib libuv rhash ]
Expand Down Expand Up @@ -130,5 +131,4 @@ stdenv.mkDerivation (rec {
maintainers = with maintainers; [ ttuegel lnl7 ];
license = licenses.bsd3;
};
} // (if withQt5 then { dontWrapQtApps = true; } else {})
)
}