Unverified Commit e62efc66 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

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

parents 1d1ab4ef b3851cde

pkgs/development/libraries/aws-sdk-cpp/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -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"

pkgs/development/libraries/nlohmann_json/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -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}";

pkgs/top-level/release-lib.nix

+2 −0
Original line number Diff line number Diff line
@@ -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