diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2020-11-26 11:02:45 -0800 |
---|---|---|
committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2020-11-26 12:28:45 -0800 |
commit | 42c89295db3ea0e5629a745c01c856bb728864fd (patch) | |
tree | cb4b90c1890f5dc4a86483cf221d03c137f001d9 /pkgs/development/libraries/aws-c-common | |
parent | 91c6eb509bcc1714ede9bd0436257ba62ff0ac69 (diff) | |
download | nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar.gz nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar.bz2 nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar.lz nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar.xz nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.tar.zst nixpkgs-42c89295db3ea0e5629a745c01c856bb728864fd.zip |
aws-c-common: fix build with cmake 3.19
Diffstat (limited to 'pkgs/development/libraries/aws-c-common')
-rw-r--r-- | pkgs/development/libraries/aws-c-common/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index b028813558f..6470566d5c7 100644 --- a/pkgs/development/libraries/aws-c-common/default.nix +++ b/pkgs/development/libraries/aws-c-common/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fetchpatch }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; + # can be removed once https://github.com/awslabs/aws-c-common/pull/735 gets merged, and version bumped + patches = [ + (fetchpatch { + name = "fix-re-export-of-target.patch"; + url = "https://github.com/awslabs/aws-c-common/pull/735/commits/3fca5c629ce0c4d66f50f7152685f3fe73941cb4.patch"; + sha256 = "056f9kyg1c4lwjq8n0r28w1n3zbwrwpi1wbqabk99gaayg46x35a"; + }) + ]; + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-Wno-nullability-extension -Wno-typedef-redefinition"; |