646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
21 lines
572 B
Diff
21 lines
572 B
Diff
commit 0a258effd3492d7e4c11b4d175538c619699fbd6
|
|
Author: rnhmjoj <rnhmjoj@inventati.org>
|
|
Date: Wed Oct 1 09:43:45 2025 +0200
|
|
|
|
Fix assets path on NixOS
|
|
|
|
diff --git a/common/assets/src/lib.rs b/common/assets/src/lib.rs
|
|
index 13102e8..898b23b 100644
|
|
--- a/common/assets/src/lib.rs
|
|
+++ b/common/assets/src/lib.rs
|
|
@@ -381,6 +381,9 @@ lazy_static! {
|
|
}
|
|
}
|
|
|
|
+ // 5. NixOS path
|
|
+ paths.push("@out@/share/veloren/".into());
|
|
+
|
|
tracing::trace!("Possible asset locations paths={:?}", paths);
|
|
|
|
for mut path in paths.clone() {
|