From fc952632d96e506faa958a807771a6577b48cf1a Mon Sep 17 00:00:00 2001 From: Emily Date: Fri, 3 Jul 2026 16:17:32 +0100 Subject: [PATCH] qt6.qtbase: work around `ld64` hardening issue --- .../libraries/qt-6/modules/qtbase/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix index 7686093f4d75..e3f60553ee63 100644 --- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix @@ -89,6 +89,9 @@ # options qttranslations ? null, fetchpatch, + + # TODO: Clean up on `staging`. + llvmPackages, }: let @@ -197,7 +200,11 @@ stdenv.mkDerivation { cmake ninja ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ moveBuildTree ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + moveBuildTree + # TODO: Clean up on `staging`. + llvmPackages.lld + ]; propagatedNativeBuildInputs = [ lndir @@ -312,6 +319,8 @@ stdenv.mkDerivation { # When this variable is not set, cmake tries to execute xcodebuild # to query the version. "-DQT_INTERNAL_XCODE_VERSION=0.1" + # TODO: Clean up on `staging`. + (lib.cmakeFeature "CMAKE_LINKER_TYPE" "LLD") ] ++ lib.optionals isCrossBuild [ "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"