diff options
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fa2d8aa8454..8558cef8abb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11387,31 +11387,31 @@ in llvmPackages_5 = recurseIntoAttrs (callPackage ../development/compilers/llvm/5 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_5.tools; - targetLlvmLibraries = targetPackages.llvmPackages_5.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_5.libraries or llvmPackages_5.libraries; }); llvmPackages_6 = recurseIntoAttrs (callPackage ../development/compilers/llvm/6 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_6.tools; - targetLlvmLibraries = targetPackages.llvmPackages_6.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_6.libraries or llvmPackages_6.libraries; }); llvmPackages_7 = recurseIntoAttrs (callPackage ../development/compilers/llvm/7 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_7.tools; - targetLlvmLibraries = targetPackages.llvmPackages_7.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_7.libraries or llvmPackages_7.libraries; }); llvmPackages_8 = recurseIntoAttrs (callPackage ../development/compilers/llvm/8 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_8.tools; - targetLlvmLibraries = targetPackages.llvmPackages_8.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_8.libraries or llvmPackages_8.libraries; }); llvmPackages_9 = recurseIntoAttrs (callPackage ../development/compilers/llvm/9 { inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_9.tools; - targetLlvmLibraries = targetPackages.llvmPackages_9.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_9.libraries or llvmPackages_9.libraries; }); llvmPackages_10 = recurseIntoAttrs (callPackage ../development/compilers/llvm/10 { @@ -11423,7 +11423,7 @@ in llvmPackages_11 = recurseIntoAttrs (callPackage ../development/compilers/llvm/11 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_11.tools; - targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; })); @@ -11431,7 +11431,7 @@ in llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_12.tools; - targetLlvmLibraries = targetPackages.llvmPackages_12.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; })); @@ -11439,7 +11439,7 @@ in llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ inherit (stdenvAdapters) overrideCC; buildLlvmTools = buildPackages.llvmPackages_13.tools; - targetLlvmLibraries = targetPackages.llvmPackages_13.libraries; + targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { stdenv = gcc7Stdenv; })); |