diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix index 59375bf5a143..4711cf27b81f 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix @@ -128,16 +128,35 @@ stdenv.mkDerivation (finalAttrs: { tests/unit/visual/tst_imageprovider.11.qml \ --replace-fail '/usr/share' '${suru-icon-theme}/share' '' + # Adjust to Qt 6.11, TODO report & submit upstream + + lib.optionalString withQt6 '' + substituteInPlace apicheck/apicheck.cpp \ + --replace-fail \ + 'attachedPropertiesType(QQmlEnginePrivate::get(currentEngine))' \ + 'attachedPropertiesType(QQmlTypeLoader::get(currentEngine))' + + substituteInPlace src/LomiriToolkit/ucstylehints.cpp \ + --replace-fail \ + 'QQmlEnginePrivate::getV4Engine(qmlEngine(this))' \ + 'qmlEngine(this)->handle()' + '' + lib.optionalString (!withQt6) '' for subproject in po app-launch-profiler lomiri-ui-toolkit-launcher; do substituteInPlace $subproject/$subproject.pro \ - --replace-fail "\''$\''$[QT_INSTALL_PREFIX]" "$out" \ - --replace-warn "\''$\''$[QT_INSTALL_LIBS]" "$out/lib" + --replace-fail '$$[QT_INSTALL_PREFIX]' "$out" done # Install apicheck tool into bin substituteInPlace apicheck/apicheck.pro \ - --replace-fail "\''$\''$[QT_INSTALL_LIBS]/lomiri-ui-toolkit" "$out/bin" + --replace-fail '$$[QT_INSTALL_LIBS]/lomiri-ui-toolkit' "$out/bin" + + substituteInPlace \ + src/LomiriMetrics/LomiriMetrics.pro \ + src/LomiriMetrics/lttng/lttng.pro \ + --replace-fail '$$[QT_INSTALL_PLUGINS]' "$out/${qtbase.qtPluginPrefix}" + + substituteInPlace features/lomiri_qml_plugin.prf \ + --replace-fail '$$[QT_INSTALL_QML]' "$out/${qtbase.qtQmlPrefix}" substituteInPlace documentation/documentation.pro \ --replace-fail '/usr/share/doc' '$$PREFIX/share/doc' \ diff --git a/pkgs/development/libraries/qdjango/default.nix b/pkgs/development/libraries/qdjango/default.nix index 1105f2839325..d0f1a66b440a 100644 --- a/pkgs/development/libraries/qdjango/default.nix +++ b/pkgs/development/libraries/qdjango/default.nix @@ -5,6 +5,7 @@ testers, doxygen, qmake, + qtbase, }: stdenv.mkDerivation (finalAttrs: { @@ -55,7 +56,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; - preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + preCheck = '' + export QT_PLUGIN_PATH=${lib.getBin qtbase}/${qtbase.qtPluginPrefix} + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' # at this point in the build, install_name for dylibs hasn't been patched yet so we need to set the library path. # for some reason, this doesn't work when just exporting the needed paths even though the autogenerated wrappers # should at most prepend paths? just patch them into the wrappers instead