From bb1d34d0f113b831bc891ffd596a85b0933eb30a Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Thu, 25 Aug 2022 19:11:45 -0700 Subject: [PATCH] cvc3: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/applications/science/logic/cvc3/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/science/logic/cvc3/default.nix b/pkgs/applications/science/logic/cvc3/default.nix index a7c49501672e..cfa8f62990c5 100644 --- a/pkgs/applications/science/logic/cvc3/default.nix +++ b/pkgs/applications/science/logic/cvc3/default.nix @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { # fails to configure on darwin due to gmp not found configureFlags = [ "LIBS=-L${gmp}/lib" "CXXFLAGS=-I${gmp.dev}/include" ]; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - postPatch = '' sed -e "s@ /bin/bash@bash@g" -i Makefile.std find . -exec sed -e "s@/usr/bin/perl@${perl}/bin/perl@g" -i '{}' ';'