diff options
| author | Will Dietz <w@wdtz.org> | 2018-03-05 17:23:47 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-03-05 17:23:47 -0600 |
| commit | 7dafa09ed93e8fb932870d839b0668c9ed1c92ee (patch) | |
| tree | 6ee42cb0dcf3791a6a671f0e1bfc1211bd24c901 /pkgs/tools | |
| parent | f5f71c08cdbf1f66b654a1321460b6a7d771c26a (diff) | |
| download | nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar.gz nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar.bz2 nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar.lz nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar.xz nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.tar.zst nixlib-7dafa09ed93e8fb932870d839b0668c9ed1c92ee.zip | |
nix: fix conditional so brotli is used w/2.0 builds, needed for logs!
cc https://github.com/NixOS/nix/issues/1951
Diffstat (limited to 'pkgs/tools')
| -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 { |