Skip to content
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

Jump to bottom

qt6.qtbase: ignore hook propagated from buildPlatform #265525

Closed
wants to merge 1 commit into from
Closed

qt6.qtbase: ignore hook propagated from buildPlatform #265525

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
10 changes: 10 additions & 0 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,3 +1,13 @@
if [[ "x$stdenv" != "x@qtbase_stdenv@" ]]; then
echo "skipping qtbase-setup-hook.sh because of mismatch:"
echo " stdenv of current derivation: $stdenv"
echo " stdenv of qtbase.dev dependency: @qtbase_stdenv@"
echo " qtbase = @dev@"
return
fi

echo "running qtbase-setup-hook.sh with hostOffset=$hostOffset targetOffset=$targetOffset: @out@"

if [[ -n "${__nix_qtbase-}" ]]; then
# Throw an error if a different version of Qt was already set up.
if [[ "$__nix_qtbase" != "@out@" ]]; then
Expand Down
6 changes: 6 additions & 0 deletions pkgs/development/libraries/qt-6/modules/qtbase.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@ stdenv.mkDerivation rec {

enableParallelBuilding = true;

env = lib.optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) {
QT_HOST_PATH = "${pkgsBuildHost.qt6Packages.qtbase}";
} // {
qtbase_stdenv = stdenv.outPath;
};

inherit patches;

# https://bugreports.qt.io/browse/QTBUG-97568
Expand Down