mirrors/envision
0
0
Fork 0
mirror of https://gitlab.com/gabmus/envision.git synced 2025-08-03 22:58:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: relativize libopenxr_monado.so path for system installs

Browse source
This commit is contained in:
Gabriele Musco 2023-06-18 00:35:26 +02:00
commit 812946786b
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/file_builders/active_runtime_json.rs
View file

@ -1,9 +1,7 @@
use std::{fs::File, io::BufReader, path::Path}; use std::{fs::File, io::BufReader, path::Path};
use expect_dialog::ExpectDialog; use expect_dialog::ExpectDialog;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use crate::{file_utils::{get_xdg_config_dir, get_xdg_data_dir, get_writer, set_file_radonly}, profile::Profile, paths::SYSTEM_PREFIX};
use crate::{file_utils::{get_xdg_config_dir, get_xdg_data_dir, get_writer, set_file_radonly}, profile::Profile};
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct ActiveRuntimeInnerRuntime { pub struct ActiveRuntimeInnerRuntime {
@ -92,7 +90,18 @@ fn build_profile_active_runtime(profile: Profile) -> ActiveRuntime {
} }
pub fn set_current_active_runtime_to_profile(profile: Profile) { pub fn set_current_active_runtime_to_profile(profile: Profile) {
dump_current_active_runtime(build_profile_active_runtime(profile)) let pfx = profile.clone().prefix;
let mut ar = build_profile_active_runtime(profile);
// hack: relativize libopenxr_monado.so path for system installs
if pfx == SYSTEM_PREFIX {
let path_s = get_active_runtime_json_path();
let path = Path::new(&path_s);
let mut rel_chain = path.components().map(|c| String::from("..")).collect::<Vec<String>>();
rel_chain.pop();
rel_chain.pop();
ar.runtime.library_path = format!("{rels}/usr/lib/libopenxr_monado.so", rels = rel_chain.join("/"));
}
dump_current_active_runtime(ar);
} }
#[cfg(test)] #[cfg(test)]