mirror of
https://gitlab.com/gabmus/envision.git
synced 2025-04-20 19:44:50 +00:00
Merge branch 'feat/wivrnLaunchOptions' into 'main'
feat: set wivrn launch options in the default profile See merge request gabmus/envision!113
This commit is contained in:
commit
cec0c64f32
2 changed files with 5 additions and 4 deletions
|
@ -5,6 +5,7 @@ use crate::{
|
|||
prepare_ld_library_path, Profile, ProfileFeatures, ProfileOvrCompatibilityModule,
|
||||
XRServiceType,
|
||||
},
|
||||
ui::job_worker::internal_worker::LAUNCH_OPTS_CMD_PLACEHOLDER,
|
||||
};
|
||||
use std::collections::HashMap;
|
||||
|
||||
|
@ -28,6 +29,9 @@ pub fn wivrn_profile() -> Profile {
|
|||
features: ProfileFeatures {
|
||||
..Default::default()
|
||||
},
|
||||
xrservice_launch_options: format!(
|
||||
"{LAUNCH_OPTS_CMD_PLACEHOLDER} --no-instructions --no-manage-active-runtime"
|
||||
),
|
||||
environment,
|
||||
prefix,
|
||||
can_be_built: true,
|
||||
|
|
|
@ -155,7 +155,7 @@ impl Worker for InternalJobWorker {
|
|||
}
|
||||
}
|
||||
|
||||
const LAUNCH_OPTS_CMD_PLACEHOLDER: &str = "%command%";
|
||||
pub const LAUNCH_OPTS_CMD_PLACEHOLDER: &str = "%command%";
|
||||
|
||||
impl InternalJobWorker {
|
||||
pub fn xrservice_worker_from_profile(
|
||||
|
@ -193,9 +193,6 @@ impl InternalJobWorker {
|
|||
} else {
|
||||
launch_opts
|
||||
};
|
||||
if !launch_opts.contains(" --no-instructions") {
|
||||
launch_opts.push_str(" --no-instructions");
|
||||
}
|
||||
let (command, args) = match launch_opts.is_empty() {
|
||||
false => (
|
||||
"sh".into(),
|
||||
|
|
Loading…
Add table
Reference in a new issue