commit 40f9a3e9d20d936793b5497f7d4a67b90281a777

pyrox.dev / nixpkgs

lol

fork atom

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!

authored by

Eelco Dolstra and committed by

GitHub 8 years ago 40f9a3e9 1f8d30f0

+1 -1

1 changed file

expand all

unified split

pkgs

tools

package-management

nix

default.nix

+1 -1

pkgs/tools/package-management/nix/default.nix

··· 29 29 30 30 buildInputs = [ curl openssl sqlite xz bzip2 ] 31 31 ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium 32 - ++ lib.optionals fromGit [ brotli ] # Since 1.12 32 + ++ lib.optionals is20 [ brotli ] # Since 1.12 33 33 ++ lib.optional (hostPlatform.isSeccomputable) libseccomp 34 34 ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) 35 35 (aws-sdk-cpp.override {