From 357745da8ae18c71f110ec3db71b654c5deaa412 Mon Sep 17 00:00:00 2001 From: Reno Dakota Date: Tue, 14 Jan 2025 21:33:03 -0800 Subject: [PATCH] llvmPackages_{12,13,14,15,16,17}.lldb: fix build with libcxx-19 https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d --- pkgs/development/compilers/llvm/common/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix index 102a43161e3d..9a8b795bdea2 100644 --- a/pkgs/development/compilers/llvm/common/default.nix +++ b/pkgs/development/compilers/llvm/common/default.nix @@ -701,6 +701,12 @@ let # FIXME: do we need this after 15? (metadata.getVersionFile "lldb/procfs.patch") ] + ++ lib.optional (lib.versionOlder metadata.release_version "18") (fetchpatch { + name = "libcxx-19-char_traits.patch"; + url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch"; + stripLen = 1; + hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc="; + }) ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch ++ lib.optional (lib.versionOlder metadata.release_version "14") ( metadata.getVersionFile "lldb/gnu-install-dirs.patch"