From e0a5a1c3a0851aeb6e896bfe52b212c30f9ce3c7 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:47:02 -0700 Subject: [PATCH] rPackages: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/development/r-modules/generic-builder.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index beb669d9893f..880fff44ed64 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation ({ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - configurePhase = '' runHook preConfigure export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library"