Merge "package: make aws-sdk-cpp build input optional" into main

2024-08-02 11:42:13 +00:00 · 2024-08-02 11:42:13 +00:00 · c907d805bf
parent 9eb374dc6d f41190552f
commit c907d805bf
1 changed files with 11 additions and 7 deletions
--- 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.