aws-sdk-cpp: 0.10.6 -> 1.0.34

edolstra · edolstra · commit b60873ed99cc · 2016-11-28T16:37:31.000+01:00
diff --git 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";
