qt6: fix references to qmake

As devTools are no longer moved to the dev output,
paths to qmake has to be updated.

Nick Cao f9f2b3ae d84e2bf0

Changed files
+5 -5
pkgs
development
libraries
+4 -4
pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
···
if [[ -n "${__nix_qtbase-}" ]]; then
# Throw an error if a different version of Qt was already set up.
-
if [[ "$__nix_qtbase" != "@dev@" ]]; then
+
if [[ "$__nix_qtbase" != "@out@" ]]; then
echo >&2 "Error: detected mismatched Qt dependencies:"
-
echo >&2 " @dev@"
+
echo >&2 " @out@"
echo >&2 " $__nix_qtbase"
exit 1
fi
else # Only set up Qt once.
-
__nix_qtbase="@dev@"
+
__nix_qtbase="@out@"
qtPluginPrefix=@qtPluginPrefix@
qtQmlPrefix=@qtQmlPrefix@
···
fi
# Build tools are often confused if QMAKE is unset.
-
export QMAKE=@dev@/bin/qmake
+
export QMAKE=@out@/bin/qmake
export QMAKEPATH=
+1 -1
pkgs/development/libraries/qt-6/qt-env.nix
···
postBuild = ''
rm "$out/bin/qmake"
-
cp "${qtbase.dev}/bin/qmake" "$out/bin"
+
cp "${qtbase}/bin/qmake" "$out/bin"
cat >"$out/bin/qt.conf" <<EOF
[Paths]
Prefix = $out