From cdc9d7628c35854e23b6e15c853221265b70ba40 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:01 +0100 Subject: [PATCH] Revert "qt5.qtbase: fix build on darwin" The ld64 issue has been fixed. This reverts commit 17cafcb3652f5a7a36fe5a5c7fb46991cc7af851. --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 480bd31a6bc1..c1e05d0a8b62 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -20,8 +20,6 @@ which, # darwin support xcbuild, - # TODO: Clean up on `staging` - llvmPackages, dbus, fontconfig, @@ -194,8 +192,6 @@ stdenv.mkDerivation ( ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild - # TODO: Clean up on `staging` - llvmPackages.lld ]; } @@ -377,12 +373,6 @@ stdenv.mkDerivation ( # if dependency paths contain the string "pq", which can occur in the hash. # To prevent these failures, we need to override PostgreSQL detection. PSQL_LIBS = "-L${libpq}/lib -lpq"; - } - // lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # Fix for ld64 hardening issue - # - # TODO: Clean up on `staging` - NIX_CFLAGS_LINK = "-fuse-ld=lld"; }; prefixKey = "-prefix ";