public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all-packages: keep llvm7 overrides for now, not default on Darwin yet

This commit is contained in:
Will Dietz 2018-10-29 10:29:11 -05:00 committed by Matthew Bauer
parent 564bf8da2b
commit 4c3c8f4a7d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/top-level/all-packages.nix
View File

@ -8793,7 +8793,11 @@ in
cpplint = callPackage ../development/tools/analysis/cpplint { }; 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 { ccls = callPackage ../development/tools/misc/ccls {
llvmPackages = llvmPackages_7; llvmPackages = llvmPackages_7;
@ -11950,6 +11954,7 @@ in
libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms; libGLSupported = lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms;
mesa_noglu = callPackage ../development/libraries/mesa { mesa_noglu = callPackage ../development/libraries/mesa {
# 7 is the default, but only on Linux, so keep this for now
llvmPackages = llvmPackages_7; llvmPackages = llvmPackages_7;
inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.frameworks) OpenGL;
inherit (darwin.apple_sdk.libs) Xplugin; inherit (darwin.apple_sdk.libs) Xplugin;