nix: make withAWS depend only on platform's aws-c-common availability (#481994)
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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: {
|
||||
|
||||
Reference in New Issue
Block a user