pyrox.dev / nixpkgs
lol
fork atom

llvmPackages_[14-17].lldb: fix build with clang-19 (#373938)

authored by

Austin Horstman and committed by
GitHub ad2c6703 482b0deb

+17 -3
unified split
+15 -1
pkgs/development/compilers/llvm/common/default.nix
··· 713 713 # FIXME: do we need this after 15? 714 714 (metadata.getVersionFile "lldb/procfs.patch") 715 715 ] 716 - ++ lib.optional (lib.versionOlder metadata.release_version "17") resourceDirPatch 716 + ++ lib.optional (lib.versionOlder metadata.release_version "18") (fetchpatch { 717 + name = "libcxx-19-char_traits.patch"; 718 + url = "https://github.com/llvm/llvm-project/commit/68744ffbdd7daac41da274eef9ac0d191e11c16d.patch"; 719 + stripLen = 1; 720 + hash = "sha256-QCGhsL/mi7610ZNb5SqxjRGjwJeK2rwtsFVGeG3PUGc="; 721 + }) 722 + ++ lib.optionals (lib.versionOlder metadata.release_version "17") [ 723 + resourceDirPatch 724 + (fetchpatch { 725 + name = "add-cstdio.patch"; 726 + url = "https://github.com/llvm/llvm-project/commit/73e15b5edb4fa4a77e68c299a6e3b21e610d351f.patch"; 727 + stripLen = 1; 728 + hash = "sha256-eFcvxZaAuBsY/bda1h9212QevrXyvCHw8Cr9ngetDr0="; 729 + }) 730 + ] 717 731 ++ lib.optional (lib.versionOlder metadata.release_version "14") ( 718 732 metadata.getVersionFile "lldb/gnu-install-dirs.patch" 719 733 )
+2 -2
pkgs/development/compilers/llvm/common/lldb.nix
··· 127 127 128 128 # TODO: cleanup with mass-rebuild 129 129 installCheckPhase = '' 130 - if [ ! -e $lib/${python3.sitePackages}/lldb/_lldb*.so ] ; then 130 + if [ ! -e ''${!outputLib}/${python3.sitePackages}/lldb/_lldb*.so ] ; then 131 131 echo "ERROR: python files not installed where expected!"; 132 132 return 1; 133 133 fi 134 134 '' # Something lua is built on older versions but this file doesn't exist. 135 135 + lib.optionalString (lib.versionAtLeast release_version "14") '' 136 - if [ ! -e "$lib/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then 136 + if [ ! -e "''${!outputLib}/lib/lua/${lua5_3.luaversion}/lldb.so" ] ; then 137 137 echo "ERROR: lua files not installed where expected!"; 138 138 return 1; 139 139 fi