pyrox.dev
lol
aws-crt-cpp: 0.29.4 -> 0.33.1
Diff: https://www.github.com/awslabs/aws-crt-cpp/compare/v0.29.4...v0.33.1
-65
pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
-65
pkgs/by-name/aw/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch
···
1
-
From b3a46b9a2a9f86ff416a0ff5f84882c0dedebd14 Mon Sep 17 00:00:00 2001
2
-
From: Jan Tojnar <jtojnar@gmail.com>
3
-
Date: Sun, 9 Jan 2022 01:57:18 +0100
4
-
Subject: [PATCH] build: Make includedir properly overrideable
5
-
6
-
This is required by some package managers like Nix.
7
-
8
-
Co-authored-by: Artturin <Artturin@artturin.com>
9
-
---
10
-
CMakeLists.txt | 26 +++++++++++++++-----------
11
-
1 file changed, 15 insertions(+), 11 deletions(-)
12
-
13
-
diff --git a/CMakeLists.txt b/CMakeLists.txt
14
-
index 9f062ca..b28f13c 100644
15
-
--- a/CMakeLists.txt
16
-
+++ b/CMakeLists.txt
17
-
@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
18
-
set(FIND_LIBRARY_USE_LIB64_PATHS true)
19
-
endif()
20
-
21
-
+if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR)
22
-
+ set(CMAKE_INSTALL_INCLUDEDIR "include")
23
-
+endif()
24
-
+
25
-
if(NOT CMAKE_CXX_STANDARD)
26
-
set(CMAKE_CXX_STANDARD 11)
27
-
endif()
28
-
@@ -329,7 +333,7 @@ endif()
29
-
target_include_directories(${PROJECT_NAME} PUBLIC
30
-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
31
-
$<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
32
-
- $<INSTALL_INTERFACE:include>)
33
-
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
34
-
35
-
aws_use_package(aws-c-http)
36
-
aws_use_package(aws-c-mqtt)
37
-
@@ -346,16 +350,16 @@ aws_add_sanitizers(${PROJECT_NAME})
38
-
39
-
target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS})
40
-
41
-
-install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development)
42
-
-install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development)
43
-
-install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "include/aws/crt/checksum" COMPONENT Development)
44
-
-install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development)
45
-
-install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "include/aws/crt/io" COMPONENT Development)
46
-
-install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "include/aws/iot" COMPONENT Development)
47
-
-install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "include/aws/crt/mqtt" COMPONENT Development)
48
-
-install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "include/aws/crt/http" COMPONENT Development)
49
-
-install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "include/aws/crt/endpoints" COMPONENT Development)
50
-
-install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "include/aws/crt/cbor" COMPONENT Development)
51
-
+install(FILES ${AWS_CRT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt" COMPONENT Development)
52
-
+install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/auth" COMPONENT Development)
53
-
+install(FILES ${AWS_CRT_CHECKSUM_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/checksum" COMPONENT Development)
54
-
+install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/crypto" COMPONENT Development)
55
-
+install(FILES ${AWS_CRT_IO_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/io" COMPONENT Development)
56
-
+install(FILES ${AWS_CRT_IOT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iot" COMPONENT Development)
57
-
+install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development)
58
-
+install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development)
59
-
+install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development)
60
-
+install(FILES ${AWS_CRT_CBOR_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/cbor" COMPONENT Development)
61
-
62
-
install(
63
-
TARGETS ${PROJECT_NAME}
64
-
--
65
-
2.46.0
+5
-9
pkgs/by-name/aw/aws-crt-cpp/package.nix
+5
-9
pkgs/by-name/aw/aws-crt-cpp/package.nix
···
20
20
stdenv.mkDerivation rec {
21
21
pname = "aws-crt-cpp";
22
22
# nixpkgs-update: no auto update
23
-
version = "0.29.4";
23
+
version = "0.33.1";
24
24
25
25
outputs = [
26
26
"out"
···
31
31
owner = "awslabs";
32
32
repo = "aws-crt-cpp";
33
33
rev = "v${version}";
34
-
sha256 = "sha256-Uv1BHM39f9soq7kziedqRhHqQ/xwnqcz++1UM5nuo8g=";
34
+
sha256 = "sha256-C8KWe5+CXujD8nN3gLkjaaMld15sat/ohwEKhyWELKI=";
35
35
};
36
36
37
-
patches = [
38
-
# Correct include path for split outputs.
39
-
# https://github.com/awslabs/aws-crt-cpp/pull/325
40
-
./0001-build-Make-includedir-properly-overrideable.patch
41
-
];
42
-
43
37
postPatch = ''
44
-
substituteInPlace CMakeLists.txt --replace '-Werror' ""
38
+
substituteInPlace CMakeLists.txt \
39
+
--replace-fail "$<INSTALL_INTERFACE:include>" "$<INSTALL_INTERFACE:$dev/include>" \
40
+
--replace-fail '-Werror' ""
45
41
'';
46
42
47
43
nativeBuildInputs = [