diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-12-18 14:23:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-18 14:23:29 -0500 |
| commit | 7ed4d836778e9c92703af73d3717506bbc696be7 (patch) | |
| tree | a399f05dc674b0f4c15f21b502cc5b5092ef951d /pkgs/development/libraries | |
| parent | 9f26e7ee023d290a1255d8032dbab2ac28993fc0 (diff) | |
| parent | 945e8a25905b6915fde365d8c6ce2830f26a6816 (diff) | |
Merge pull request #274827 from NickCao/latomic
treewide: drop libatomic workaround for riscv
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/libjxl/default.nix | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index a22cd04b5efd..448139358e65 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -78,8 +78,6 @@ stdenv.mkDerivation rec { # propagation is needed for Security.framework to be available when linking propagatedBuildInputs = [ aws-crt-cpp ]; - # Ensure the linker is using atomic when compiling for RISC-V, otherwise fails - LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; cmakeFlags = [ "-DBUILD_DEPS=OFF" diff --git a/pkgs/development/libraries/libjxl/default.nix b/pkgs/development/libraries/libjxl/default.nix index 9be574e9eaa0..820f466d8447 100644 --- a/pkgs/development/libraries/libjxl/default.nix +++ b/pkgs/development/libraries/libjxl/default.nix @@ -117,7 +117,6 @@ stdenv.mkDerivation rec { "-DJPEGXL_FORCE_NEON=ON" ]; - LDFLAGS = lib.optionalString stdenv.hostPlatform.isRiscV "-latomic"; CXXFLAGS = lib.optionalString stdenv.hostPlatform.isAarch32 "-mfp16-format=ieee"; # FIXME x86_64-darwin: |