mirror of
https://gitlab.com/gabmus/envision.git
synced 2025-04-19 19:14:53 +00:00
fix: post merge
This commit is contained in:
parent
1f37b27de0
commit
39c1f24950
2 changed files with 5 additions and 6 deletions
|
@ -40,7 +40,7 @@ pub fn get_build_stardust_jobs(
|
|||
let server_git = Git {
|
||||
repo: server_spec.repo,
|
||||
dir: get_stardust_base_dir() + "/stardust-xr-server",
|
||||
default_branch: server_spec.branch,
|
||||
branch: server_spec.branch
|
||||
};
|
||||
let prefix = get_stardust_prefix();
|
||||
jobs.extend(server_git.get_pre_build_jobs(update));
|
||||
|
|
|
@ -1,9 +1,7 @@
|
|||
use std::{collections::VecDeque, path::Path};
|
||||
|
||||
use crate::{
|
||||
builders::build_stardust::{get_build_stardust_jobs, StardustServerSpec},
|
||||
dependencies::stardust_deps::get_missing_stardust_deps,
|
||||
linux_distro::get_distro,
|
||||
linux_distro::LinuxDistro,
|
||||
paths::get_stardust_prefix,
|
||||
stardust_config::StardustConfig,
|
||||
stateless_action,
|
||||
|
@ -14,12 +12,13 @@ use crate::{
|
|||
},
|
||||
};
|
||||
use adw::prelude::*;
|
||||
use gtk::{glib::clone, prelude::*};
|
||||
use gtk::glib::clone;
|
||||
use relm4::{
|
||||
actions::{ActionGroupName, RelmAction, RelmActionGroup},
|
||||
new_action_group, new_stateless_action,
|
||||
prelude::*,
|
||||
};
|
||||
use std::{collections::VecDeque, path::Path};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub enum StardustViewMsg {
|
||||
|
@ -272,7 +271,7 @@ impl SimpleComponent for StardustView {
|
|||
Self::Input::BuildStardust { update } => {
|
||||
let missing_deps = get_missing_stardust_deps();
|
||||
if !missing_deps.is_empty() {
|
||||
let distro = get_distro();
|
||||
let distro = LinuxDistro::get();
|
||||
alert(
|
||||
"Missing dependencies:",
|
||||
Some(
|
||||
|
|
Loading…
Add table
Reference in a new issue