diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2019-02-12 23:38:13 +0100 |
---|---|---|
committer | Daiderd Jordan <daiderd@gmail.com> | 2019-02-12 23:38:13 +0100 |
commit | a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae (patch) | |
tree | 288e0aa4cc656efc34fe41c539d18497859bc0c2 /pkgs | |
parent | 91c7157919081c5bbc8cb808e27d89ed4a8cbef7 (diff) | |
download | nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar.gz nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar.bz2 nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar.lz nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar.xz nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.tar.zst nixpkgs-a4a7fd8d681b2af9ff81a74b2ab457c58b07e1ae.zip |
aws-sdk-cpp: fix darwin sandbox build
The tests use localhost networking, which is disallowed by default in the darwin sandbox.
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/aws-sdk-cpp/default.nix | 8 | ||||
-rw-r--r-- | 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 0825cdcfc09..a5517a2522d 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 2df5884d610..825d87f9354 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 { }; |