From 966d630d8fc6d156459ce2fecdd05b8312f201e7 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 21 Jan 2026 01:30:48 +0100 Subject: [PATCH] nix: make withAWS depend only on platform's aws-c-common availability --- pkgs/tools/package-management/nix/common-meson.nix | 5 +---- .../package-management/nix/modular/src/libstore/package.nix | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 87351e481677..1524571859eb 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -59,10 +59,7 @@ assert (hash == null) -> (src != null); xz, enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, enableStatic ? stdenv.hostPlatform.isStatic, - withAWS ? - lib.meta.availableOn stdenv.hostPlatform aws-c-common - && !enableStatic - && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + withAWS ? lib.meta.availableOn stdenv.hostPlatform aws-c-common, aws-c-common, aws-sdk-cpp, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 11aee41a57cf..6c5978bfd7e8 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -25,9 +25,7 @@ withAWS ? # Default is this way because there have been issues building this dependency - stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.isLinux || stdenv.isDarwin) - && lib.meta.availableOn stdenv.hostPlatform aws-c-common, + lib.meta.availableOn stdenv.hostPlatform aws-c-common, }: mkMesonLibrary (finalAttrs: {