llvmPackages_{11,12,13,14}: remove stdenv override
This doesn't seem required anymore. (Present in NixOS x86_64 via i686 compat libs with things like wine/steam)
This commit is contained in:
@@ -14727,8 +14727,6 @@ with pkgs;
|
||||
buildLlvmTools = buildPackages.llvmPackages_11.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_11.libraries or llvmPackages_11.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_11.llvm or llvmPackages_11.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_12 = recurseIntoAttrs (callPackage ../development/compilers/llvm/12 ({
|
||||
@@ -14736,8 +14734,6 @@ with pkgs;
|
||||
buildLlvmTools = buildPackages.llvmPackages_12.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_12.libraries or llvmPackages_12.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_12.llvm or llvmPackages_12.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_13 = recurseIntoAttrs (callPackage ../development/compilers/llvm/13 ({
|
||||
@@ -14745,8 +14741,6 @@ with pkgs;
|
||||
buildLlvmTools = buildPackages.llvmPackages_13.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_13.libraries or llvmPackages_13.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_13.llvm or llvmPackages_13.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_14 = recurseIntoAttrs (callPackage ../development/compilers/llvm/14 ({
|
||||
@@ -14754,8 +14748,6 @@ with pkgs;
|
||||
buildLlvmTools = buildPackages.llvmPackages_14.tools;
|
||||
targetLlvmLibraries = targetPackages.llvmPackages_14.libraries or llvmPackages_14.libraries;
|
||||
targetLlvm = targetPackages.llvmPackages_14.llvm or llvmPackages_14.llvm;
|
||||
} // lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.hostPlatform == stdenv.buildPlatform && buildPackages.stdenv.cc.isGNU) {
|
||||
stdenv = gcc7Stdenv;
|
||||
}));
|
||||
|
||||
llvmPackages_latest = llvmPackages_14;
|
||||
|
||||
Reference in New Issue
Block a user