mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-09-26 19:28:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: try to find libmonado and openxr shared objects by reading openxr config

Browse source
This commit is contained in:
Gabriele Musco 2024-12-05 07:50:26 +01:00
commit 92cd8f6a94
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/profile.rs
View file

@ -4,8 +4,9 @@ use crate::{
mercury_deps::get_missing_mercury_deps, monado_deps::get_missing_monado_deps, mercury_deps::get_missing_mercury_deps, monado_deps::get_missing_monado_deps,
openhmd_deps::get_missing_openhmd_deps, wivrn_deps::get_missing_wivrn_deps, Dependency, openhmd_deps::get_missing_openhmd_deps, wivrn_deps::get_missing_wivrn_deps, Dependency,
}, },
file_builders::active_runtime_json::ActiveRuntime,
paths::{get_data_dir, BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX}, paths::{get_data_dir, BWRAP_SYSTEM_PREFIX, SYSTEM_PREFIX},
util::file_utils::get_writer, util::file_utils::{deserialize_file, get_writer},
xdg::XDG, xdg::XDG,
}; };
use nix::NixPath; use nix::NixPath;
@ -645,21 +646,37 @@ impl Profile {
} }
/// absolute path to a given shared object in the profile prefix /// absolute path to a given shared object in the profile prefix
pub fn find_so(&self, rel_path: &str) -> Option<PathBuf> { pub fn find_so<P: AsRef<Path>>(&self, rel_path: P) -> Option<PathBuf> {
["lib", "lib64"] ["lib", "lib64"]
.into_iter() .into_iter()
.map(|lib| self.prefix.join(lib).join(rel_path)) .map(|lib| self.prefix.join(lib).join(rel_path.as_ref()))
.find(|path| path.is_file()) .find(|path| path.is_file())
} }
/// absolute path to the libmonado shared object /// absolute path to the libmonado shared object
pub fn libmonado_so(&self) -> Option<PathBuf> { pub fn libmonado_so(&self) -> Option<PathBuf> {
self.find_so(self.xrservice_type.libmonado_path()) // try by reading the openxr json file
self.openxr_config()
.and_then(|conf| conf.runtime.libmonado_path)
.and_then(|libmonado_path| self.find_so(&libmonado_path))
.or_else(||
// try with the hardcoded paths
self.find_so(self.xrservice_type.libmonado_path()))
}
fn openxr_config(&self) -> Option<ActiveRuntime> {
deserialize_file(&self.openxr_json_path())
} }
/// absolute path to the libopenxr shared object /// absolute path to the libopenxr shared object
pub fn libopenxr_so(&self) -> Option<PathBuf> { pub fn libopenxr_so(&self) -> Option<PathBuf> {
self.find_so(self.xrservice_type.libopenxr_path()) // try by reading the openxr json file
self.openxr_config()
.map(|conf| conf.runtime.library_path)
.and_then(|libmonado_path| self.find_so(&libmonado_path))
.or_else(||
// try with the hardcoded paths
self.find_so(self.xrservice_type.libopenxr_path()))
} }
pub fn missing_dependencies(&self) -> Vec<Dependency> { pub fn missing_dependencies(&self) -> Vec<Dependency> {