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

aws-sdk-cpp: fix darwin sandbox build and cleanup

authored by

Daiderd Jordan and committed by
GitHub
aee2dc88 1583db78

+9 -5
+5 -3
pkgs/development/libraries/aws-sdk-cpp/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, cmake, curl, openssl, zlib 2 + , CoreAudio, AudioToolbox 2 3 , # Allow building a limited set of APIs, e.g. ["s3" "ec2"]. 3 4 apis ? ["*"] 4 5 , # Whether to enable AWS' custom memory management. 5 6 customMemoryManagement ? true 6 - , darwin 7 7 }: 8 8 9 9 let ··· 34 34 ++ lib.optionals (stdenv.isDarwin && 35 35 ((builtins.elem "text-to-speech" apis) || 36 36 (builtins.elem "*" apis))) 37 - (with darwin.apple_sdk.frameworks; [ CoreAudio AudioToolbox ]); 37 + [ CoreAudio AudioToolbox ]; 38 38 39 39 cmakeFlags = 40 - lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" 40 + lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0" 41 41 ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DENABLE_TESTING=OFF" 42 42 ++ lib.optional (apis != ["*"]) 43 43 "-DBUILD_ONLY=${lib.concatStringsSep ";" apis}"; ··· 59 59 ''; 60 60 61 61 NIX_CFLAGS_COMPILE = [ "-Wno-error=noexcept-type" ]; 62 + 63 + __darwinAllowLocalNetworking = true; 62 64 63 65 meta = { 64 66 description = "A C++ interface for Amazon Web Services";
+4 -2
pkgs/top-level/all-packages.nix
··· 9341 9341 inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices; 9342 9342 }; 9343 9343 9344 - aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { }; 9344 + aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { 9345 + inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; 9346 + }; 9345 9347 9346 9348 babl = callPackage ../development/libraries/babl { }; 9347 9349 ··· 21458 21460 21459 21461 bftools = callPackage ../applications/science/biology/bftools { }; 21460 21462 21461 - cmtk = callPackage ../applications/science/biology/cmtk { }; 21463 + cmtk = callPackage ../applications/science/biology/cmtk { }; 21462 21464 21463 21465 conglomerate = callPackage ../applications/science/biology/conglomerate { }; 21464 21466