From 53fd303d0eef1d8710548c7923588f8a52263c06 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 1 Apr 2021 20:11:15 +0200 Subject: [PATCH] llvmPackages_12: Add recurseIntoAttrs See #115288 (835a8f1cbc5). This was missing for LLVM 12 because both changes where made in parallel. --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fef7f5b1d75..c740d0e156b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10894,13 +10894,13 @@ in stdenv = gcc7Stdenv; })); - llvmPackages_12 = callPackage ../development/compilers/llvm/12 ({ + llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; - }); + })); llvmPackages_latest = llvmPackages_11;