diff options
| author | Jeremy List <quick.dudley@gmail.com> | 2024-08-02 11:42:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-08-02 11:42:13 +0000 |
| commit | c907d805bf733562aee97f1c3d77743351036c67 (patch) | |
| tree | 5ce328911d7007180f48b916b1eb10c30f25ae90 | |
| parent | 9eb374dc6da5cd0e8f96522342a5b0a27fc5946b (diff) | |
| parent | f41190552f44963ea586470280053792a169a694 (diff) | |
Merge "package: make aws-sdk-cpp build input optional" into main
| -rw-r--r-- | package.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/package.nix b/package.nix index 62927e569..7ebe2721b 100644 --- a/package.nix +++ b/package.nix @@ -88,13 +88,17 @@ let version = __forDefaults.versionJson.version + versionSuffix; - aws-sdk-cpp-nix = aws-sdk-cpp.override { - apis = [ - "s3" - "transfer" - ]; - customMemoryManagement = false; - }; + aws-sdk-cpp-nix = + if aws-sdk-cpp == null then + null + else + aws-sdk-cpp.override { + apis = [ + "s3" + "transfer" + ]; + customMemoryManagement = false; + }; # Reimplementation of Nixpkgs' Meson cross file, with some additions to make # it actually work. |