alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

aws-sdk-cpp: 1.0.34 -> 1.0.43

Browse source 
Since this drops the problematic libuuid dependency, enable on Darwin.
This commit is contained in:
Eelco Dolstra 2016-12-22 15:04:49 +01:00
parent c52195daaf
commit 215b1e519b
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/development/libraries/aws-sdk-cpp/default.nix
View file

@ -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"]. , # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
apis ? ["*"] apis ? ["*"]
, # Whether to enable AWS' custom memory management. , # Whether to enable AWS' custom memory management.
@ -7,20 +7,22 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "aws-sdk-cpp-${version}"; name = "aws-sdk-cpp-${version}";
version = "1.0.34"; version = "1.0.43";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "awslabs"; owner = "awslabs";
repo = "aws-sdk-cpp"; repo = "aws-sdk-cpp";
rev = version; rev = version;
sha256 = "09vag1ybfqvw37djmd9g740iqjvg8nwr4p0xb21rfj06vazrdg4b"; sha256 = "0sa0pkkbxxfn3h7b19yf296r5g5nqm4aqpwrkij0rq7jix9lxqj6";
}; };
patches = [ ./s3-encryption-headers.patch ];
# FIXME: might be nice to put different APIs in different outputs # FIXME: might be nice to put different APIs in different outputs
# (e.g. libaws-cpp-sdk-s3.so in output "s3"). # (e.g. libaws-cpp-sdk-s3.so in output "s3").
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
buildInputs = [ cmake curl libuuid ]; buildInputs = [ cmake curl ];
cmakeFlags = cmakeFlags =
lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
@ -39,13 +41,13 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = lib.concatStringsSep " " ( NIX_LDFLAGS = lib.concatStringsSep " " (
(map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib")) (map (pkg: "-rpath ${lib.getOutput "lib" pkg}/lib"))
[ libuuid curl openssl zlib stdenv.cc.cc ]); [ 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;
license = lib.licenses.asl20; license = lib.licenses.asl20;
platforms = lib.platforms.linux; platforms = lib.platforms.linux ++ lib.platforms.darwin;
maintainers = [ lib.maintainers.eelco ]; maintainers = [ lib.maintainers.eelco ];
}; };
} }

18
pkgs/development/libraries/aws-sdk-cpp/s3-encryption-headers.patch Normal file
View file

@ -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()