b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #168826 from Madouura/dev/linux-riscv

Browse source
This commit is contained in:
Sandro 2022-11-25 20:54:51 +01:00 committed by GitHub
parent 1d1ab4ef92 b3851cdeb0
commit e62efc6694
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -92,6 +92,8 @@ 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"

3
pkgs/development/libraries/nlohmann_json/default.nix
View file

@ -24,7 +24,8 @@ in stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ cmake ];
cmakeFlags = [
"-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DJSON_BuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}"
"-DJSON_FastTests=ON"
"-DJSON_MultipleHeaders=ON"
] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}";

2
pkgs/top-level/release-lib.nix
View file

@ -27,6 +27,7 @@ rec {
pkgs_x86_64_linux = packageSet' { system = "x86_64-linux"; };
pkgs_i686_linux = packageSet' { system = "i686-linux"; };
pkgs_aarch64_linux = packageSet' { system = "aarch64-linux"; };
pkgs_riscv64_linux = packageSet' { system = "riscv64-linux"; };
pkgs_aarch64_darwin = packageSet' { system = "aarch64-darwin"; };
pkgs_armv6l_linux = packageSet' { system = "armv6l-linux"; };
pkgs_armv7l_linux = packageSet' { system = "armv7l-linux"; };
@ -40,6 +41,7 @@ rec {
if system == "x86_64-linux" then pkgs_x86_64_linux
else if system == "i686-linux" then pkgs_i686_linux
else if system == "aarch64-linux" then pkgs_aarch64_linux
else if system == "riscv64-linux" then pkgs_riscv64_linux
else if system == "aarch64-darwin" then pkgs_aarch64_darwin
else if system == "armv6l-linux" then pkgs_armv6l_linux
else if system == "armv7l-linux" then pkgs_armv7l_linux