JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33473 from dtzWill/fix/aws-sdk-cpp-cross

Browse Source 
aws-sdk-cpp: Enable cross-compilation
This commit is contained in:
Orivej Desh 2018-01-06 03:59:21 +00:00 committed by GitHub
commit 769d7dad66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -28,7 +28,8 @@ in stdenv.mkDerivation rec {
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
separateDebugInfo = stdenv.isLinux; separateDebugInfo = stdenv.isLinux;
buildInputs = [ cmake curl ]; nativeBuildInputs = [ cmake curl ];
buildInputs = [ zlib curl openssl ];
cmakeFlags = cmakeFlags =
lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
@ -51,10 +52,6 @@ in stdenv.mkDerivation rec {
rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
''; '';
NIX_LDFLAGS = lib.concatStringsSep " " (
(map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib"))
[ curl openssl zlib stdenv.cc.cc ]);
meta = { meta = {
description = "A C++ interface for Amazon Web Services"; description = "A C++ interface for Amazon Web Services";
homepage = https://github.com/awslabs/aws-sdk-cpp; homepage = https://github.com/awslabs/aws-sdk-cpp;