From 975a5cb35076e523cf2117fc8d3184562b284a0f Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:31 +0100 Subject: [PATCH] Revert "topgrade: fix Darwin build" The ld64 issue has been fixed. This reverts commit f93cef19e8c20f24cd5aff2617ac99917b489ea6. --- pkgs/by-name/to/topgrade/package.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix index 45ef928a6052..c3609237d5a3 100644 --- a/pkgs/by-name/to/topgrade/package.nix +++ b/pkgs/by-name/to/topgrade/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, rustPlatform, installShellFiles, - llvmPackages, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -22,18 +21,14 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ installShellFiles - ] - # TODO: Remove once #536365 reaches this branch - ++ lib.optionals stdenv.hostPlatform.isDarwin [ llvmPackages.lld ]; + ]; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - NIX_CFLAGS_COMPILE = toString [ + env.NIX_CFLAGS_COMPILE = toString ( + lib.optionals stdenv.hostPlatform.isDarwin [ "-framework" "AppKit" - ]; - # TODO: Remove once #536365 reaches this branch - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; + ] + ); postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd topgrade \