mirror of
https://github.com/NixOS/nix
synced 2025-06-25 10:41:16 +02:00
Add a withAWS
flag to libstore
Nixpkgs wants this, at least.
(cherry picked from commit e4c571c2f1
)
This commit is contained in:
parent
384415ddc0
commit
f6f89041c0
1 changed files with 5 additions and 3 deletions
|
@ -21,6 +21,10 @@
|
||||||
version,
|
version,
|
||||||
|
|
||||||
embeddedSandboxShell ? stdenv.hostPlatform.isStatic,
|
embeddedSandboxShell ? stdenv.hostPlatform.isStatic,
|
||||||
|
|
||||||
|
withAWS ?
|
||||||
|
# Default is this way because there have been issues building this dependency
|
||||||
|
stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin),
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -60,9 +64,7 @@ mkMesonLibrary (finalAttrs: {
|
||||||
++ lib.optional stdenv.hostPlatform.isLinux libseccomp
|
++ lib.optional stdenv.hostPlatform.isLinux libseccomp
|
||||||
# There have been issues building these dependencies
|
# There have been issues building these dependencies
|
||||||
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
|
++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.libs.sandbox
|
||||||
++ lib.optional (
|
++ lib.optional withAWS aws-sdk-cpp;
|
||||||
stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)
|
|
||||||
) aws-sdk-cpp;
|
|
||||||
|
|
||||||
propagatedBuildInputs = [
|
propagatedBuildInputs = [
|
||||||
nix-util
|
nix-util
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue