From c51a4944d1e60f1b8411e1287aa75ca2a346ccbc Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 5 Feb 2025 11:07:55 +0300 Subject: [PATCH] qt6: disable xcode version check on Darwin We use xcbuild, not official xcode. --- pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 1 + pkgs/development/libraries/qt-6/qtModule.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index ce5c5758e450..0c7ee34a8d83 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -275,6 +275,7 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DQT_FEATURE_rpath=OFF" + "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON" ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}" diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix index a4813a0c29e6..0fd30eef2dcf 100644 --- a/pkgs/development/libraries/qt-6/qtModule.nix +++ b/pkgs/development/libraries/qt-6/qtModule.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation ( (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or [ ]) ++ (args.propagatedBuildInputs or [ ]); + cmakeFlags = args.cmakeFlags or [ ] + ++ lib.optional stdenv.hostPlatform.isDarwin "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"; + moveToDev = false; outputs =