qt6.qtbase: prepare for structuredAttrs (#472656)

This commit is contained in:
Philip Taron
2026-01-31 15:52:40 +00:00
committed by GitHub
@@ -9,6 +9,8 @@
lndir,
perl,
pkg-config,
copyPathToStore,
makeSetupHook,
which,
cmake,
ninja,
@@ -90,8 +92,12 @@
let
isCrossBuild = !stdenv.buildPlatform.canExecute stdenv.hostPlatform;
fix_qt_builtin_paths = copyPathToStore ../../hooks/fix-qt-builtin-paths.sh;
fix_qt_module_paths = copyPathToStore ../../hooks/fix-qt-module-paths.sh;
qtPluginPrefix = "lib/qt-6/plugins";
qtQmlPrefix = "lib/qt-6/qml";
in
stdenv.mkDerivation rec {
stdenv.mkDerivation {
pname = "qtbase";
inherit src version;
@@ -261,16 +267,11 @@ stdenv.mkDerivation rec {
--replace-fail 'CONFIG += ' 'CONFIG += no_default_rpath '
'';
fix_qt_builtin_paths = ../../hooks/fix-qt-builtin-paths.sh;
fix_qt_module_paths = ../../hooks/fix-qt-module-paths.sh;
preHook = ''
. "$fix_qt_builtin_paths"
. "$fix_qt_module_paths"
. ${fix_qt_builtin_paths}
. ${fix_qt_module_paths}
'';
qtPluginPrefix = "lib/qt-6/plugins";
qtQmlPrefix = "lib/qt-6/qml";
cmakeFlags = [
# makes Qt print the configure summary
"--log-level=STATUS"
@@ -329,7 +330,25 @@ stdenv.mkDerivation rec {
dontWrapQtApps = true;
setupHook = ../../hooks/qtbase-setup-hook.sh;
setupHook =
let
hook = makeSetupHook {
name = "qtbase6-setup-hook";
substitutions = {
inherit
fix_qt_builtin_paths
fix_qt_module_paths
qtPluginPrefix
qtQmlPrefix
;
};
} ../../hooks/qtbase-setup-hook.sh;
in
"${hook}/nix-support/setup-hook";
passthru = {
inherit qtPluginPrefix qtQmlPrefix;
};
meta = {
homepage = "https://www.qt.io/";