mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
Merge pull request #36360 from dtzWill/fix/nix-use-brotli-for-sanity
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
This commit is contained in:
commit
40f9a3e9d2
@ -29,7 +29,7 @@ let
|
||||
|
||||
buildInputs = [ curl openssl sqlite xz bzip2 ]
|
||||
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
|
||||
++ lib.optionals fromGit [ brotli ] # Since 1.12
|
||||
++ lib.optionals is20 [ brotli ] # Since 1.12
|
||||
++ lib.optional (hostPlatform.isSeccomputable) libseccomp
|
||||
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
|
||||
(aws-sdk-cpp.override {
|
||||
|
Loading…
Reference in New Issue
Block a user