summary refs log tree commit diff
path: root/pkgs/development/libraries/science/math
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2022-02-23 12:01:11 +0000
committerGitHub <noreply@github.com>2022-02-23 12:01:11 +0000
commit10c4b97b44aa7e9606f0a47bcee2fed8787b367c (patch)
tree8ad9655ce2cb7945f88bb1a990e9545832da7524 /pkgs/development/libraries/science/math
parent05ecbb1ac223727812c2af641b98e356dab2e2ef (diff)
parenta8de36a1d03ec1c1da7993edb2c18b35bb588b08 (diff)
downloadnixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar.gz
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar.bz2
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar.lz
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar.xz
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.tar.zst
nixpkgs-10c4b97b44aa7e9606f0a47bcee2fed8787b367c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/libraries/science/math')
-rw-r--r--pkgs/development/libraries/science/math/petsc/default.nix5
1 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix
index 4a4208e1cbe..3eb0fa66dfa 100644
--- a/pkgs/development/libraries/science/math/petsc/default.nix
+++ b/pkgs/development/libraries/science/math/petsc/default.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation rec {
 
   configureScript = "python ./configure";
 
+  # disable stackprotector on aarch64-darwin for now
+  # https://github.com/NixOS/nixpkgs/issues/158730
+  # see https://github.com/NixOS/nixpkgs/issues/127608 for a similar issue
+  hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ];
+
   enableParallelBuilding = true;
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform;