diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2018-03-06 12:01:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 12:01:31 +0100 |
| commit | 40f9a3e9d20d936793b5497f7d4a67b90281a777 (patch) | |
| tree | c0e478e95891dadcb11333448cb32fef5245cf46 | |
| parent | 1f8d30f0bfcc829d7fa3f5a430d501f9e2f86ed4 (diff) | |
| parent | 7dafa09ed93e8fb932870d839b0668c9ed1c92ee (diff) | |
| download | nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar.gz nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar.bz2 nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar.lz nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar.xz nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.tar.zst nixlib-40f9a3e9d20d936793b5497f7d4a67b90281a777.zip | |
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!
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b634969c8ac0..246819d3dc06 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -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 { |