diff options
| author | Will Dietz <w@wdtz.org> | 2018-10-29 10:29:11 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2019-04-20 23:17:04 -0400 |
| commit | 4c3c8f4a7d5d82e3a148819d8c80bdef6bcb0c6f (patch) | |
| tree | 4844c382e32c3ff4ad73020274915a6fe6049d45 | |
| parent | 564bf8da2bb2c0f0813b41edd2255b9886f2c373 (diff) | |
all-packages: keep llvm7 overrides for now, not default on Darwin yet
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1acea30d4f045..1551b2b3a1bbd 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; |