Skip to content

qt6.qtbase: fix package reference in setup hook #493437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mjoerg wants to merge 1 commit into from
+7 −4
Closed

qt6.qtbase: fix package reference in setup hook #493437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions pkgs/development/libraries/qt-6/hooks/qtbase-setup-hook.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" != "@out@" ]]; then
if [[ "$__nix_qtbase" != "@finalPackageOut@" ]]; then
echo >&2 "Error: detected mismatched Qt dependencies:"
echo >&2 " @out@"
echo >&2 " @finalPackageOut@"
echo >&2 " $__nix_qtbase"
exit 1
fi
else # Only set up Qt once.
__nix_qtbase="@out@"
__nix_qtbase="@finalPackageOut@"

qtPluginPrefix=@qtPluginPrefix@
qtQmlPrefix=@qtQmlPrefix@
Expand All @@ -16,7 +16,7 @@ else # Only set up Qt once.
. @fix_qt_module_paths@

# Build tools are often confused if QMAKE is unset.
export QMAKE=@out@/bin/qmake
export QMAKE=@finalPackageOut@/bin/qmake

export QMAKEPATH=

Expand Down
3 changes: 3 additions & 0 deletions pkgs/development/libraries/qt-6/modules/qtbase/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,9 @@ stdenv.mkDerivation {

dontWrapQtApps = true;

# workaround to correctly reference the actual package in the final setup hook
finalPackageOut = placeholder "out";

setupHook =
let
hook = makeSetupHook {
Expand Down
Loading