Skip to content

Commit da2fcf6

Browse files
authored
nix: make withAWS depend only on platform's aws-c-common availability (#481994)
2 parents d5ac490 + 966d630 commit da2fcf6

2 files changed

Lines changed: 2 additions & 7 deletions

File tree

pkgs/tools/package-management/nix/common-meson.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ assert (hash == null) -> (src != null);
5959
xz,
6060
enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
6161
enableStatic ? stdenv.hostPlatform.isStatic,
62-
withAWS ?
63-
lib.meta.availableOn stdenv.hostPlatform aws-c-common
64-
&& !enableStatic
65-
&& (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin),
62+
withAWS ? lib.meta.availableOn stdenv.hostPlatform aws-c-common,
6663
aws-c-common,
6764
aws-sdk-cpp,
6865
withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,

pkgs/tools/package-management/nix/modular/src/libstore/package.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626
withAWS ?
2727
# Default is this way because there have been issues building this dependency
28-
stdenv.hostPlatform == stdenv.buildPlatform
29-
&& (stdenv.isLinux || stdenv.isDarwin)
30-
&& lib.meta.availableOn stdenv.hostPlatform aws-c-common,
28+
lib.meta.availableOn stdenv.hostPlatform aws-c-common,
3129
}:
3230

3331
mkMesonLibrary (finalAttrs: {

0 commit comments

Comments
 (0)