qt6: fix references to qmake
As devTools are no longer moved to the dev output, paths to qmake has to be updated.
This commit is contained in:
parent
d84e2bf056
commit
f9f2b3ae42
|
@ -1,13 +1,13 @@
|
|||
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@
|
||||
|
@ -30,7 +30,7 @@ else # Only set up Qt once.
|
|||
fi
|
||||
|
||||
# Build tools are often confused if QMAKE is unset.
|
||||
export QMAKE=@dev@/bin/qmake
|
||||
export QMAKE=@out@/bin/qmake
|
||||
|
||||
export QMAKEPATH=
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ buildEnv {
|
|||
|
||||
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
|
||||
|
|
Loading…
Reference in a new issue