From 734bc6c4e9411321aeb2e29da318f3a9ea330516 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 15 Jul 2026 03:19:29 +0100 Subject: [PATCH] Revert "R: fix build on darwin" The ld64 issue has been fixed. This reverts commit f03ea24eb13ee4d647def42e799ed0644e4d7ca8. --- pkgs/applications/science/math/R/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index f227a7f742f0..6376bf4f08e8 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -27,7 +27,6 @@ pkg-config, bison, which, - llvmPackages, jdk, blas, lapack, @@ -69,10 +68,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config tzdata which - ] - # TODO: Remove once #536365 reaches this branch - ++ lib.optional stdenv.hostPlatform.isDarwin llvmPackages.lld; - + ]; buildInputs = [ bzip2 gfortran @@ -130,11 +126,6 @@ stdenv.mkDerivation (finalAttrs: { dontDisableStatic = static; - env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - # TODO: Remove once #536365 reaches this branch - NIX_CFLAGS_LINK = "-fuse-ld=lld"; - }; - preConfigure = '' configureFlagsArray=( --disable-lto