JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #55671 from LnL7/darwin-aws-sdk-cpp

Browse Source 
aws-sdk-cpp: fix darwin sandbox build and cleanup
This commit is contained in:
Daiderd Jordan 2019-02-13 22:23:27 +01:00 committed by GitHub
commit aee2dc8899
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/aws-sdk-cpp/default.nix
View File

@ -1,9 +1,9 @@
{ lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib
, CoreAudio, AudioToolbox
, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
apis ? ["*"]
, # Whether to enable AWS' custom memory management.
customMemoryManagement ? true
, darwin
}:
let
@ -34,10 +34,10 @@ in stdenv.mkDerivation rec {
++ lib.optionals (stdenv.isDarwin &&
((builtins.elem "text-to-speech" apis) ||
(builtins.elem "*" apis)))
(with darwin.apple_sdk.frameworks; [ CoreAudio AudioToolbox ]);
[ CoreAudio AudioToolbox ];
cmakeFlags =
lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF"
++ lib.optional (apis != ["*"])
"-DBUILD_ONLY=${lib.concatStringsSep ";" apis}";
@ -60,6 +60,8 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ];
__darwinAllowLocalNetworking = true;
meta = {
description = "A C++ interface for Amazon Web Services";
homepage = https://github.com/awslabs/aws-sdk-cpp;

6
pkgs/top-level/all-packages.nix
View File

@ -9341,7 +9341,9 @@ in
inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
};
aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { };
aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp {
inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox;
};
babl = callPackage ../development/libraries/babl { };
@ -21458,7 +21460,7 @@ in
bftools = callPackage ../applications/science/biology/bftools { };
cmtk = callPackage ../applications/science/biology/cmtk { };
cmtk = callPackage ../applications/science/biology/cmtk { };
conglomerate = callPackage ../applications/science/biology/conglomerate { };