diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-09-04 10:58:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-04 10:58:59 +0200 |
| commit | b727af80648e7346a4f2410d9d1a1f551a35f6f5 (patch) | |
| tree | adc89554f738fda5063c6bc4358c05a04f7e78fa | |
| parent | 3d1fe8482bc964acd18ad3b6d6ed97a430f02cc3 (diff) | |
| parent | 56486fab3bb89832ed91968ce385295015fa7b27 (diff) | |
Merge pull request #188352 from tjni/sundials-stackprotector
sundials: reenable stackprotector on aarch64-darwin
| -rw-r--r-- | pkgs/development/libraries/sundials/default.nix | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 3093c5330a88..867d109d71b2 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -61,21 +61,6 @@ stdenv.mkDerivation rec { )] ; - # disable stackprotector on aarch64-darwin for now - # https://github.com/NixOS/nixpkgs/issues/127608 - # - # build error: - # - # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:21:15: error: index must be an integer in range [-256, 255]. - # ldr x0, [x0, ___stack_chk_guard];momd - # ^ - # /private/tmp/nix-build-sundials-6.3.0.drv-0/ccD2dUtR.s:46:15: error: index must be an integer in range [-256, 255]. - # ldr x0, [x0, ___stack_chk_guard];momd - # - # See also a proposed solution: https://github.com/NixOS/nixpkgs/pull/151983 - - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - doCheck = true; checkTarget = "test"; |