diff options
Diffstat (limited to 'pkgs/development/libraries/aws-crt-cpp')
-rw-r--r-- | pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch | 36 | ||||
-rw-r--r-- | pkgs/development/libraries/aws-crt-cpp/default.nix | 4 |
2 files changed, 20 insertions, 20 deletions
diff --git a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch b/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch index 9b61316ffb91..2b06ce0aec63 100644 --- a/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch +++ b/pkgs/development/libraries/aws-crt-cpp/0001-build-Make-includedir-properly-overrideable.patch @@ -1,6 +1,6 @@ -From 2370ee92e78cfb0d55e3958b63ac71b16567b5fd Mon Sep 17 00:00:00 2001 +From fd3f3a28e7fce7fe4e10ed2d7edc4bfda8ab27df Mon Sep 17 00:00:00 2001 From: Jan Tojnar <jtojnar@gmail.com> -Date: Wed, 9 Nov 2022 17:59:17 +0100 +Date: Sun, 9 Jan 2022 01:57:18 +0100 Subject: [PATCH] build: Make includedir properly overrideable This is required by some package managers like Nix. @@ -9,33 +9,33 @@ This is required by some package managers like Nix. 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9f13d21..f6e62c7 100644 +index ec6d172..6514c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -66,6 +66,10 @@ elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR) - set(CMAKE_INSTALL_LIBDIR "lib") +@@ -49,6 +49,10 @@ if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") + set(FIND_LIBRARY_USE_LIB64_PATHS true) endif() - + +if(NOT DEFINED CMAKE_INSTALL_INCLUDEDIR) + set(CMAKE_INSTALL_INCLUDEDIR "include") +endif() + - if(${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64") - set(FIND_LIBRARY_USE_LIB64_PATHS true) + if(NOT CMAKE_CXX_STANDARD) + set(CMAKE_CXX_STANDARD 11) endif() -@@ -322,7 +326,7 @@ endif() - +@@ -307,7 +311,7 @@ endif() target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> + $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}> - $<INSTALL_INTERFACE:include>) + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) - + aws_use_package(aws-c-http) aws_use_package(aws-c-mqtt) -@@ -336,14 +340,14 @@ aws_use_package(aws-c-s3) - - target_link_libraries(${PROJECT_NAME} ${DEP_AWS_LIBS}) - +@@ -324,14 +328,14 @@ aws_add_sanitizers(${PROJECT_NAME}) + + target_link_libraries(${PROJECT_NAME} PUBLIC ${DEP_AWS_LIBS}) + -install(FILES ${AWS_CRT_HEADERS} DESTINATION "include/aws/crt" COMPONENT Development) -install(FILES ${AWS_CRT_AUTH_HEADERS} DESTINATION "include/aws/crt/auth" COMPONENT Development) -install(FILES ${AWS_CRT_CRYPTO_HEADERS} DESTINATION "include/aws/crt/crypto" COMPONENT Development) @@ -52,8 +52,8 @@ index 9f13d21..f6e62c7 100644 +install(FILES ${AWS_CRT_MQTT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/mqtt" COMPONENT Development) +install(FILES ${AWS_CRT_HTTP_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/http" COMPONENT Development) +install(FILES ${AWS_CRT_ENDPOINT_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/crt/endpoints" COMPONENT Development) - + install( TARGETS ${PROJECT_NAME} --- -2.37.3 +-- +2.42.0 diff --git a/pkgs/development/libraries/aws-crt-cpp/default.nix b/pkgs/development/libraries/aws-crt-cpp/default.nix index 0f44dab59db4..0cd6e4940c4d 100644 --- a/pkgs/development/libraries/aws-crt-cpp/default.nix +++ b/pkgs/development/libraries/aws-crt-cpp/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pname = "aws-crt-cpp"; - version = "0.20.3"; + version = "0.24.7"; outputs = [ "out" "dev" ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { owner = "awslabs"; repo = "aws-crt-cpp"; rev = "v${version}"; - sha256 = "sha256-70AchkuhuyumwpBYaj9mOVPJ8+6VSLTLtr3ghwqG3wM="; + sha256 = "sha256-AYO0ckqEx2jG7HduvaxASQMOsxuHGkRkyVsUP5WOs98="; }; patches = [ |