ananicy-cpp: patch to fix build on llvm_19 (#367927)

This commit is contained in:
Masum Reza
2024-12-27 13:19:25 +05:30
committed by GitHub
2 changed files with 14 additions and 17 deletions

View File

@@ -29,15 +29,25 @@ clangStdenv.mkDerivation (finalAttrs: {
}; };
patches = [ patches = [
# FIXME: remove this when updating to next stable release ./match-wrappers.patch
# FIXME: remove these when updating to next stable release
(fetchpatch { (fetchpatch {
name = "allow-regex-pattern-matching.patch"; name = "allow-regex-pattern-matching.patch";
url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch"; url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs="; hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
}) })
./match-wrappers.patch (fetchpatch {
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/27 name = "use-a-reliable-path-for-mounts-file.patch";
./reliable-mounts-file.patch url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/de6f11978db98bfd13a1e87dcdab61dbe6496710.patch";
hash = "sha256-9bJlFCClddlAEknfqp7Gcij7NX6tqohE2wqoalLoN5I=";
})
# https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/30
(fetchpatch {
name = "fix-build-with-clang-19.patch";
url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/b2589a9b1faa2ecf54aeede40ea781c33bfb09a8.patch";
hash = "sha256-nfyCdhvnWj446z5aPFCXGi79Xgja8W0Eopl6I30fOBM=";
})
]; ];
strictDeps = true; strictDeps = true;

View File

@@ -1,13 +0,0 @@
diff --git a/src/platform/linux/cgroups.cpp b/src/platform/linux/cgroups.cpp
index 766fd2f5247ce64eb7dfd45e5551f41773eaa18b..d27dbf724bdf5097dfda0c8d4eaaadb3e81f70b3 100644
--- a/src/platform/linux/cgroups.cpp
+++ b/src/platform/linux/cgroups.cpp
@@ -223,7 +223,7 @@ control_groups::cgroup_info control_groups::get_cgroup_version(bool reset) {
}
if (!info.has_value()) {
- std::ifstream mtab("/etc/mtab");
+ std::ifstream mtab("/proc/self/mounts");
while (mtab) {
std::string word, line;
fs::path cgroup_path;