diff options
author | Nick Cao <nickcao@nichi.co> | 2023-12-18 12:30:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-18 12:30:05 -0500 |
commit | b3ecefc2ad806949e544fbd683282ab12a2eae10 (patch) | |
tree | 753c610397374ce6c90c3404db528d6d1cfca63b | |
parent | 2381cb3edac2b320cf0f9401452425d77c0210c8 (diff) | |
parent | 50bf72a24901303d6f1f31b15e4509af3ee4adda (diff) |
Merge pull request #275084 from patryk4815/fix-riscv64-unicorn
unicorn: fix build on riscv
-rw-r--r-- | pkgs/development/libraries/unicorn/default.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/development/libraries/unicorn/default.nix b/pkgs/development/libraries/unicorn/default.nix index 89adbc102578..b6a91a7367a4 100644 --- a/pkgs/development/libraries/unicorn/default.nix +++ b/pkgs/development/libraries/unicorn/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { IOKit ]; + # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; + cmakeFlags = lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ # Some x86 tests are interrupted by signal 10 "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;test_x86" |