From 18c432fbb2d26c7002be7542d9cbe70dc330ebc6 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 8 Dec 2020 09:33:01 -0800 Subject: [PATCH] Revert "aws-c-common: fix build with cmake 3.19" This reverts commit 42c89295db3ea0e5629a745c01c856bb728864fd. no longer needed with cmake namelink fixes --- pkgs/development/libraries/aws-c-common/default.nix | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/pkgs/development/libraries/aws-c-common/default.nix b/pkgs/development/libraries/aws-c-common/default.nix index 6470566d5c7..b028813558f 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, fetchpatch }: +{ lib, stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "aws-c-common"; @@ -13,15 +13,6 @@ 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";