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

fix: post merge

Browse source
This commit is contained in:
Gabriele Musco 2024-01-27 18:13:47 +01:00
commit 39c1f24950
No known key found for this signature in database
GPG key ID: 1068D795C80E51DE
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/builders/build_stardust.rs
View file

@ -40,7 +40,7 @@ pub fn get_build_stardust_jobs(
let server_git = Git { let server_git = Git {
repo: server_spec.repo, repo: server_spec.repo,
dir: get_stardust_base_dir() + "/stardust-xr-server", dir: get_stardust_base_dir() + "/stardust-xr-server",
default_branch: server_spec.branch, branch: server_spec.branch
}; };
let prefix = get_stardust_prefix(); let prefix = get_stardust_prefix();
jobs.extend(server_git.get_pre_build_jobs(update)); jobs.extend(server_git.get_pre_build_jobs(update));

9
src/ui/stardust/stardust_view.rs
View file

@ -1,9 +1,7 @@
use std::{collections::VecDeque, path::Path};
use crate::{ use crate::{
builders::build_stardust::{get_build_stardust_jobs, StardustServerSpec}, builders::build_stardust::{get_build_stardust_jobs, StardustServerSpec},
dependencies::stardust_deps::get_missing_stardust_deps, dependencies::stardust_deps::get_missing_stardust_deps,
linux_distro::get_distro, linux_distro::LinuxDistro,
paths::get_stardust_prefix, paths::get_stardust_prefix,
stardust_config::StardustConfig, stardust_config::StardustConfig,
stateless_action, stateless_action,
@ -14,12 +12,13 @@ use crate::{
}, },
}; };
use adw::prelude::*; use adw::prelude::*;
use gtk::{glib::clone, prelude::*}; use gtk::glib::clone;
use relm4::{ use relm4::{
actions::{ActionGroupName, RelmAction, RelmActionGroup}, actions::{ActionGroupName, RelmAction, RelmActionGroup},
new_action_group, new_stateless_action, new_action_group, new_stateless_action,
prelude::*, prelude::*,
}; };
use std::{collections::VecDeque, path::Path};
#[derive(Debug)] #[derive(Debug)]
pub enum StardustViewMsg { pub enum StardustViewMsg {
@ -272,7 +271,7 @@ impl SimpleComponent for StardustView {
Self::Input::BuildStardust { update } => { Self::Input::BuildStardust { update } => {
let missing_deps = get_missing_stardust_deps(); let missing_deps = get_missing_stardust_deps();
if !missing_deps.is_empty() { if !missing_deps.is_empty() {
let distro = get_distro(); let distro = LinuxDistro::get();
alert( alert(
"Missing dependencies:", "Missing dependencies:",
Some( Some(