diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/cpp/googleapis/default.nix | 2 | ||||
| -rw-r--r-- | third_party/default.nix | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/third_party/cpp/googleapis/default.nix b/third_party/cpp/googleapis/default.nix index 5fc40ac9f7ad..32f7d6f9bc1d 100644 --- a/third_party/cpp/googleapis/default.nix +++ b/third_party/cpp/googleapis/default.nix @@ -4,7 +4,7 @@ let inherit (pkgs) fetchFromGitHub; - stdenv = with pkgs; overrideCC pkgs.stdenv clang_10; + stdenv = with pkgs; overrideCC pkgs.stdenv clang_11; in stdenv.mkDerivation { name = "googleapis-cpp"; src = ./.; diff --git a/third_party/default.nix b/third_party/default.nix index 69bd75642c83..10e78bcc2031 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -54,8 +54,7 @@ let cairo cargo cgit - clang-tools - clang_10 + clang_11 cmake coreutils cudatoolkit @@ -220,10 +219,14 @@ in exposed.lib.fix(self: exposed // { ffmpeg = nixpkgs.ffmpeg-full; }; - # Use LLVM 10 - llvmPackages = nixpkgs.llvmPackages_10; - clangStdenv = nixpkgs.llvmPackages_10.stdenv; - stdenv = nixpkgs.llvmPackages_10.stdenv; + # Use LLVM 11 + llvmPackages = nixpkgs.llvmPackages_11; + clangStdenv = nixpkgs.llvmPackages_11.stdenv; + stdenv = nixpkgs.llvmPackages_11.stdenv; + + clang-tools = (nixpkgs.clang-tools.override { + llvmPackages = nixpkgs.llvmPackages_11; + }); # Provide Emacs 27 # |