diff options
| author | Orivej Desh <orivej@gmx.fr> | 2018-01-06 03:59:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-06 03:59:21 +0000 |
| commit | 769d7dad66f04d130f72d653607a64753c1d8a1a (patch) | |
| tree | b73a3e4f0d8246a917339d9db2db60eaf4e6e211 /pkgs/development/libraries | |
| parent | 4516c9e0bc73f5981ebb1c79146f3b0cf3eed25e (diff) | |
| parent | 716194de5051165892b9362c1d863ff7ef2a8cb2 (diff) | |
| download | nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar.gz nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar.bz2 nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar.lz nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar.xz nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.tar.zst nixlib-769d7dad66f04d130f72d653607a64753c1d8a1a.zip | |
Merge pull request #33473 from dtzWill/fix/aws-sdk-cpp-cross
aws-sdk-cpp: Enable cross-compilation
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 7 |
1 files 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; |