diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2016-11-28 16:14:35 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2016-11-28 16:37:31 +0100 |
commit | b60873ed99ccdcd4c0fadc452ba025a75176dc16 (patch) | |
tree | 6356ad9722cd8b9bd0047f8346df8369a80f8036 /pkgs/development/libraries/aws-sdk-cpp | |
parent | 8eefcb5c097ee1c70797ade2d5d8a696443610c9 (diff) |
aws-sdk-cpp: 0.10.6 -> 1.0.34
Diffstat (limited to 'pkgs/development/libraries/aws-sdk-cpp')
-rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 948cbacf8766..3f5ebd9a8c13 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, curl +{ lib, stdenv, fetchFromGitHub, cmake, curl, libuuid, openssl, zlib , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -7,25 +7,21 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "0.10.6"; + version = "1.0.34"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "1x3xam7vprlld6iqhqgdhgmqyclfy8dvzgy3375cijy9akhvv67i"; + sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; }; - buildInputs = [ cmake curl ]; + buildInputs = [ cmake curl libuuid ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" ++ lib.optional (apis != ["*"]) - "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}"; - - # curl upgrade to 7.50.0 (#17152) changes the libcurl headers slightly and - # therefore requires the followin flag until this package gets updated - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; enableParallelBuilding = true; @@ -37,12 +33,9 @@ stdenv.mkDerivation rec { done ''; - postInstall = - '' - # Move the .so files to a more reasonable location. - mv $out/lib/linux/*/Release/*.so $out/lib - rm -rf $out/lib/linux - ''; + NIX_LDFLAGS = lib.concatStringsSep " " ( + (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) + [ libuuid curl openssl zlib stdenv.cc.cc ]); meta = { description = "A C++ interface for Amazon Web Services"; |