diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-12-22 15:04:49 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-12-22 17:18:20 +0100 |
| commit | 215b1e519be5bbda6c472de2b851fea3e65d060f (patch) | |
| tree | 2fc3a06627c5a3ac2f6334e2c1a502267030706c /pkgs/development/libraries/aws-sdk-cpp | |
| parent | c52195daaf587ca3573bad92563a9d2c922eb415 (diff) | |
aws-sdk-cpp: 1.0.34 -> 1.0.43
Since this drops the problematic libuuid dependency, enable on Darwin.
Diffstat (limited to 'pkgs/development/libraries/aws-sdk-cpp')
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch | 18 |
2 files changed, 26 insertions, 6 deletions
diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index d5d7371aebf3..bb07b41b059c 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, libuuid, openssl, zlib +{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. apis ? ["*"] , # Whether to enable AWS' custom memory management. @@ -7,20 +7,22 @@ stdenv.mkDerivation rec { name = "aws-sdk-cpp-${version}"; - version = "1.0.34"; + version = "1.0.43"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-sdk-cpp"; rev = version; - sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; + sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6"; }; + patches = [ ./s3-encryption-headers.patch ]; + # FIXME: might be nice to put different APIs in different outputs # (e.g. libaws-cpp-sdk-s3.so in output "s3"). outputs = [ "out" "dev" ]; - buildInputs = [ cmake curl libuuid ]; + buildInputs = [ cmake curl ]; cmakeFlags = lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" @@ -39,13 +41,13 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = lib.concatStringsSep " " ( (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) - [ libuuid curl openssl zlib stdenv.cc.cc ]); + [ curl openssl zlib stdenv.cc.cc ]); meta = { description = "A C++ interface for Amazon Web Services"; homepage = https://github.com/awslabs/aws-sdk-cpp; license = lib.licenses.asl20; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch new file mode 100644 index 000000000000..10e427a15099 --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch @@ -0,0 +1,18 @@ +diff --git a/aws-cpp-sdk-s3-encryption/CMakeLists.txt b/aws-cpp-sdk-s3-encryption/CMakeLists.txt +index 0a1a907..cf9ce0e 100644 +--- a/aws-cpp-sdk-s3-encryption/CMakeLists.txt ++++ b/aws-cpp-sdk-s3-encryption/CMakeLists.txt +@@ -69,9 +69,9 @@ target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS}) + + setup_install() + +-install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION include/aws/s3-encryption) +-install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION include/aws/s3-encryption/materials) +-install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION include/aws/s3-encryption/handlers) +-install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION include/aws/s3-encryption/modules) ++install (FILES ${S3ENCRYPTION_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption) ++install (FILES ${S3ENCRYPTION_MATERIALS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/materials) ++install (FILES ${S3ENCRYPTION_HANDLERS_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/handlers) ++install (FILES ${S3ENCRYPTION_MODULES_HEADERS} DESTINATION ${INCLUDE_DIRECTORY}/aws/s3-encryption/modules) + + do_packaging() |