nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-06 00:51:00 +01:00
Code Activity

Add S3 opt dep to Meson, and simplify build

Browse source 
Numeric version macros are now defined upstream, so we don't need roll
our own.
This commit is contained in:
John Ericson 2024-07-22 10:40:21 -04:00
parent 823baa25f3
commit d7024ac9b7
3 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/meson.build
View file

@ -100,6 +100,23 @@ deps_public += nlohmann_json
sqlite = dependency('sqlite3', 'sqlite', version : '>=3.6.19')
deps_private += sqlite
# AWS C++ SDK has bad pkg-config
aws_s3 = dependency('aws-cpp-sdk-s3', required : false)
configdata.set('ENABLE_S3', aws_s3.found().to_int())
if aws_s3.found()
aws_s3 = declare_dependency(
include_directories: include_directories(aws_s3.get_variable('includedir')),
link_args: [
'-L' + aws_s3.get_variable('libdir'),
'-laws-cpp-sdk-transfer',
'-laws-cpp-sdk-s3',
'-laws-cpp-sdk-core',
'-laws-crt-cpp',
],
)
endif
deps_other += aws_s3
subdir('build-utils-meson/generate-header')
generated_headers = []