Skip to content

Commit d334702

Browse files
authored
qt6: prevent Xcode version sniffing (#421405)
2 parents 7e16b79 + e34775b commit d334702

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

pkgs/development/libraries/qt-6/modules/qtbase/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,10 @@ stdenv.mkDerivation rec {
269269
++ lib.optionals stdenv.hostPlatform.isDarwin [
270270
"-DQT_FEATURE_rpath=OFF"
271271
"-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
272+
# This is only used for the min version check, which we disabled above.
273+
# When this variable is not set, cmake tries to execute xcodebuild
274+
# to query the version.
275+
"-DQT_INTERNAL_XCODE_VERSION=0.1"
272276
]
273277
++ lib.optionals isCrossBuild [
274278
"-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"

pkgs/development/libraries/qt-6/qtModule.nix

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,13 @@ stdenv.mkDerivation (
4242
# don't leak OS version into the final output
4343
# https://bugreports.qt.io/browse/QTBUG-136060
4444
[ "-DCMAKE_SYSTEM_VERSION=" ]
45-
++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
45+
++ lib.optionals stdenv.hostPlatform.isDarwin [
46+
"-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
47+
# This is only used for the min version check, which we disabled above.
48+
# When this variable is not set, cmake tries to execute xcodebuild
49+
# to query the version.
50+
"-DQT_INTERNAL_XCODE_VERSION=0.1"
51+
]
4652
++ args.cmakeFlags or [ ];
4753

4854
moveToDev = false;

0 commit comments

Comments
 (0)