Skip to content

Commit

Permalink
llvmPackages: fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
RossComputerGuy committed Feb 6, 2025
1 parent b7712c6 commit 872a4ba
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions pkgs/development/compilers/llvm/common/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,11 @@ let
llvm = tools.libllvm;

tblgen = callPackage ./tblgen.nix {
patches = builtins.filter
# Crude method to drop polly patches if present, they're not needed for tblgen.
(p: (!lib.hasInfix "-polly" p)) tools.libllvm.patches;
patches =
builtins.filter
# Crude method to drop polly patches if present, they're not needed for tblgen.
(p: (!lib.hasInfix "-polly" p))
tools.libllvm.patches;
clangPatches = [
# Would take tools.libclang.patches, but this introduces a cycle due
# to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
Expand All @@ -532,12 +534,13 @@ let
# libraries. eg: `clang -munsupported hello.c -lc`
./clang/clang-unsupported-option.patch
]
++ lib.optional (lib.versions.major metadata.release_version == "13")
# Revert of https://reviews.llvm.org/D100879
# The malloc alignment assumption is incorrect for jemalloc and causes
# mis-compilation in firefox.
# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
(metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch")
++
lib.optional (lib.versions.major metadata.release_version == "13")
# Revert of https://reviews.llvm.org/D100879
# The malloc alignment assumption is incorrect for jemalloc and causes
# mis-compilation in firefox.
# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1741454
(metadata.getVersionFile "clang/revert-malloc-alignment-assumption.patch")
++ lib.optional (lib.versionOlder metadata.release_version "17") (
if lib.versionAtLeast metadata.release_version "14" then
fetchpatch {
Expand Down Expand Up @@ -666,7 +669,7 @@ let
lldbPlugins = lib.makeExtensible (
lldbPlugins:
let
callPackage = newScope ( lldbPlugins // tools // args // metadata );
callPackage = newScope (lldbPlugins // tools // args // metadata);
in
lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
);
Expand Down

0 comments on commit 872a4ba

Please sign in to comment.