qt6: prevent Xcode version sniffing (#421405)

authored by K900 and committed by GitHub d3347025 7e16b797

+11 -1
+4
pkgs/development/libraries/qt-6/modules/qtbase/default.nix
··· 269 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 270 "-DQT_FEATURE_rpath=OFF" 271 "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON" 272 ] 273 ++ lib.optionals isCrossBuild [ 274 "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
··· 269 ++ lib.optionals stdenv.hostPlatform.isDarwin [ 270 "-DQT_FEATURE_rpath=OFF" 271 "-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" 276 ] 277 ++ lib.optionals isCrossBuild [ 278 "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"
+7 -1
pkgs/development/libraries/qt-6/qtModule.nix
··· 42 # don't leak OS version into the final output 43 # https://bugreports.qt.io/browse/QTBUG-136060 44 [ "-DCMAKE_SYSTEM_VERSION=" ] 45 - ++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON" 46 ++ args.cmakeFlags or [ ]; 47 48 moveToDev = false;
··· 42 # don't leak OS version into the final output 43 # https://bugreports.qt.io/browse/QTBUG-136060 44 [ "-DCMAKE_SYSTEM_VERSION=" ] 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 + ] 52 ++ args.cmakeFlags or [ ]; 53 54 moveToDev = false;