ld64 workaround reverts (#544049)

pkgs/by-name/co/concord-tui/package.nix

@@ -7,8 +7,6 @@
   opus,
   lib,
   stdenv,
-  # TODO: Clean up on `staging`
-  lld,
   nix-update-script,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -33,21 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     cmake
-  ]
-  # TODO: Clean up on `staging`
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    lld
   ];
 
   __darwinAllowLocalNetworking = true;
 
   __structuredAttrs = true;
 
-  # TODO: Clean up on `staging`
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' lld "ld64.lld"}";
-  };
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

pkgs/by-name/sk/sketchybar/package.nix

@@ -5,7 +5,6 @@
   nix-update-script,
   apple-sdk_15,
   versionCheckHook,
-  llvmPackages,
 }:
 
 let
@@ -22,20 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5tyc/yYzdV/3JTtujuj7le/14XkC7TlN/nZg7tOZsNg=";
   };
 
-  nativeBuildInputs = [
-    # TODO: Remove once #536365 reaches this branch
-    llvmPackages.lld
-  ];
-
   buildInputs = [
     apple-sdk_15
   ];
 
   makeFlags = [ "arm64" ];
 
-  # TODO: Remove once #536365 reaches this branch
-  env.NIX_CFLAGS_LINK = "-fuse-ld=lld";
-
   installPhase = ''
     runHook preInstall
 

pkgs/by-name/vf/vfkit/package.nix

@@ -5,7 +5,6 @@
   darwin,
   fetchFromGitHub,
   fetchpatch2,
-  llvmPackages,
   nix-update-script,
   testers,
   vfkit,
@@ -34,17 +33,12 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     darwin.sigtool
-    # TODO: Remove this when NixOS/nixpkgs#536365 reaches master.
-    llvmPackages.lld
   ];
 
   buildInputs = [
     apple-sdk_15
   ];
 
-  # TODO: Remove this when NixOS/nixpkgs#536365 reaches master.
-  env.NIX_CFLAGS_LINK = "-fuse-ld=${lib.getExe' llvmPackages.lld "ld64.lld"}";
-
   postFixup = ''
     codesign --entitlements vf.entitlements -f -s - $out/bin/vfkit
   '';