From a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Tue, 12 Feb 2019 23:38:13 +0100 Subject: [PATCH] aws-sdk-cpp: fix darwin sandbox build The tests use localhost networking, which is disallowed by default in the darwin sandbox. --- pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 +++++--- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index 0825cdcfc098..a5517a2522dc 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -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; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2df5884d610b..825d87f9354d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9369,7 +9369,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 { }; @@ -21533,7 +21535,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 { };