Unverified Commit da2fcf67 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

nix: make withAWS depend only on platform's aws-c-common availability (#481994)

parents d5ac490d 966d630d

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

+1 −4
Original line number Diff line number Diff line
@@ -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,

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

+1 −3
Original line number Diff line number Diff line
@@ -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: {