From 8dddd6d4a1a276e00501595f19d6eaaede41c1b1 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 5 Jan 2019 11:19:37 +0000 Subject: [PATCH] clang-tools: override llvm version in all-packages --- pkgs/development/tools/clang-tools/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix index 2ababe85d0c..42bcf7fd055 100644 --- a/pkgs/development/tools/clang-tools/default.nix +++ b/pkgs/development/tools/clang-tools/default.nix @@ -1,7 +1,7 @@ -{ stdenv, writeScript, llvmPackages_latest }: +{ stdenv, writeScript, llvmPackages }: let - clang = llvmPackages_latest.clang-unwrapped; + clang = llvmPackages.clang-unwrapped; version = stdenv.lib.getVersion clang; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c8b53ffc84..c54b5390350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6668,7 +6668,9 @@ in clang_37 = llvmPackages_37.clang; clang_35 = wrapCC llvmPackages_35.clang; - clang-tools = callPackage ../development/tools/clang-tools { }; + clang-tools = callPackage ../development/tools/clang-tools { + llvmPackages = llvmPackages_latest; + }; clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };