diff --git a/pkgs/by-name/xj/xjadeo/package.nix b/pkgs/by-name/xj/xjadeo/package.nix
index da78344f118d..ab7ae228ad7e 100644
--- a/pkgs/by-name/xj/xjadeo/package.nix
+++ b/pkgs/by-name/xj/xjadeo/package.nix
@@ -10,7 +10,6 @@
   liblo,
   libx11,
   libxv,
-  llvmPackages,
   pkg-config,
   portmidi,
   libxpm,
@@ -31,9 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-  ]
-  # TODO: Remove once #536365 reaches this branch
-  ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld;
+  ];
 
   buildInputs = [
     ffmpeg
@@ -55,11 +52,6 @@ stdenv.mkDerivation (finalAttrs: {
     libxv
   ];
 
-  # TODO: Remove once #536365 reaches this branch
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_LINK = "-fuse-ld=lld";
-  };
-
   meta = {
     description = "X Jack Video Monitor";
     longDescription = ''