From 7dafa09ed93e8fb932870d839b0668c9ed1c92ee Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 5 Mar 2018 17:23:47 -0600 Subject: [PATCH] nix: fix conditional so brotli is used w/2.0 builds, needed for logs! cc https://github.com/NixOS/nix/issues/1951 --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 {