From c0324ab3a33db96ec7776724a3c6f078dac1288b Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:37 +0100 Subject: [PATCH] Revert "telegram-desktop: work around ld64 hardening issue" The ld64 issue has been fixed. This reverts commit f5616cc38c3ec227efa85d9f7c9195837efab8c3. --- .../telegram/telegram-desktop/unwrapped.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index e1072e07d6ea..7472cc1155db 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -34,7 +34,6 @@ libjxl, libicns, apple-sdk_15, - llvmPackages, nix-update-script, }: @@ -68,11 +67,6 @@ stdenv.mkDerivation (finalAttrs: { # to build bundled libdispatch clang gobject-introspection - ] - # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5 - # TODO: Remove once nixpkgs#536365 reaches this branch. - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - llvmPackages.lld ]; buildInputs = [ @@ -108,12 +102,6 @@ stdenv.mkDerivation (finalAttrs: { dontWrapQtApps = true; - # Work around ld64's libc++ hardening issue causing Trace/BPT trap: 5 - # TODO: Remove once nixpkgs#536365 reaches this branch. - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - cmakeFlags = [ # We're allowed to used the API ID of the Snap package: (lib.cmakeFeature "TDESKTOP_API_ID" "611335")