From 4c3c8f4a7d5d82e3a148819d8c80bdef6bcb0c6f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 29 Oct 2018 10:29:11 -0500
Subject: [PATCH] all-packages: keep llvm7 overrides for now, not default on
 Darwin yet

---
 pkgs/top-level/all-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1acea30d4f0..1551b2b3a1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8793,7 +8793,11 @@ in
 
   cpplint = callPackage ../development/tools/analysis/cpplint { };
 
-  cquery = callPackage ../development/tools/misc/cquery { };
+  cquery = callPackage ../development/tools/misc/cquery {
+    # 7 is the default, but only on Linux, so keep this for now
+    llvmPackages = llvmPackages_7;
+  };
+
 
   ccls = callPackage ../development/tools/misc/ccls {
     llvmPackages = llvmPackages_7;
@@ -11950,6 +11954,7 @@ in
   libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
 
   mesa_noglu = callPackage ../development/libraries/mesa {
+    # 7 is the default, but only on Linux, so keep this for now
     llvmPackages = llvmPackages_7;
     inherit (darwin.apple_sdk.frameworks) OpenGL;
     inherit (darwin.apple_sdk.libs) Xplugin;