pyrox.dev / nixpkgs
lol
fork atom

Merge #184408: llvmPackages_{11,12,13,14}: remove stdenv override

Vladimír Čunát 94a3d6ef 3586ad34

-8
unified split
-8
pkgs/top-level/all-packages.nix
··· 14716 buildLlvmTools = buildPackages.llvmPackages_11.tools; 14717 targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; 14718 targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; 14719 - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { 14720 - stdenv = gcc7Stdenv; 14721 })); 14722 14723 llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ ··· 14725 buildLlvmTools = buildPackages.llvmPackages_12.tools; 14726 targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; 14727 targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; 14728 - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { 14729 - stdenv = gcc7Stdenv; 14730 })); 14731 14732 llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ ··· 14734 buildLlvmTools = buildPackages.llvmPackages_13.tools; 14735 targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; 14736 targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; 14737 - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { 14738 - stdenv = gcc7Stdenv; 14739 })); 14740 14741 llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ ··· 14743 buildLlvmTools = buildPackages.llvmPackages_14.tools; 14744 targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; 14745 targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; 14746 - } // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) { 14747 - stdenv = gcc7Stdenv; 14748 })); 14749 14750 llvmPackages_latest = llvmPackages_14;
··· 14716 buildLlvmTools = buildPackages.llvmPackages_11.tools; 14717 targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries; 14718 targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm; 14719 })); 14720 14721 llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({ ··· 14723 buildLlvmTools = buildPackages.llvmPackages_12.tools; 14724 targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries; 14725 targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm; 14726 })); 14727 14728 llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({ ··· 14730 buildLlvmTools = buildPackages.llvmPackages_13.tools; 14731 targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries; 14732 targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm; 14733 })); 14734 14735 llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({ ··· 14737 buildLlvmTools = buildPackages.llvmPackages_14.tools; 14738 targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries; 14739 targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm; 14740 })); 14741 14742 llvmPackages_latest = llvmPackages_14;