From 716194de5051165892b9362c1d863ff7ef2a8cb2 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Sun, 10 Dec 2017 10:14:24 -0500 Subject: [PATCH] aws-sdk-cpp: Enable cross-compilation --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 40df40480f3c..47d9e7dba4ce 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; separateDebugInfo = stdenv.isLinux; - buildInputs = [ cmake curl ]; + nativeBuildInputs = [ cmake curl ]; + buildInputs = [ zlib curl openssl ]; cmakeFlags = 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 ''; - NIX_LDFLAGS = lib.concatStringsSep " " ( - (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ curl openssl zlib stdenv.cc.cc ]); - meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp;