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! (cherry picked from commit 40f9a3e)
NixOS · Mar 6, 2018 · 66a621d · 66a621d
1 parent a2037bb
commit 66a621d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 {