apitrace: add enableGui option
The motivation for this change is to be able to cross-compile apitrace, at least without the GUI. Fixing GUI cross-compilation is blocked by Note that we also move `python3` into `nativeBuildInputs`, which is also required to make cross-compilation work.
This commit is contained in:
@@ -13,6 +13,7 @@
|
||||
libglvnd,
|
||||
gtest,
|
||||
brotli,
|
||||
enableGui ? true,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -32,19 +33,25 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
libX11
|
||||
procps
|
||||
python3
|
||||
libdwarf
|
||||
qtbase
|
||||
gtest
|
||||
brotli
|
||||
] ++ lib.optionals enableGui [
|
||||
qtbase
|
||||
];
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
pkg-config
|
||||
python3
|
||||
] ++ lib.optionals enableGui [
|
||||
wrapQtAppsHook
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
(lib.cmakeBool "ENABLE_GUI" enableGui)
|
||||
];
|
||||
|
||||
# Don't automatically wrap all binaries, I prefer to explicitly only wrap
|
||||
# `qapitrace`.
|
||||
dontWrapQtApps = true;
|
||||
@@ -83,6 +90,7 @@ stdenv.mkDerivation rec {
|
||||
patchelf --set-rpath "${lib.makeLibraryPath [ libglvnd ]}:$(patchelf --print-rpath $i)" $i
|
||||
done
|
||||
|
||||
'' + lib.optionalString enableGui ''
|
||||
wrapQtApp $out/bin/qapitrace
|
||||
'';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user