diff --git a/src/depcheck/common.rs b/src/depcheck/common.rs index dcae582..901d0ff 100644 --- a/src/depcheck/common.rs +++ b/src/depcheck/common.rs @@ -319,3 +319,19 @@ pub fn dep_getcap_setcap() -> Dependency { ]), } } + +pub fn dep_glslc() -> Dependency { + Dependency { + name: "glslc".into(), + dep_type: DepType::Executable, + filename: "glslc".into(), + packages: HashMap::from([ + (LinuxDistro::Arch, "shaderc".into()), + (LinuxDistro::Debian, "glslc".into()), + (LinuxDistro::Fedora, "glslc".into()), + (LinuxDistro::Alpine, "shaderc".into()), + (LinuxDistro::Gentoo, "media-libs/shaderc".into()), + (LinuxDistro::Suse, "shaderc".into()), + ]), + } +} diff --git a/src/depcheck/monado_deps.rs b/src/depcheck/monado_deps.rs index e1cd9f9..f9e1b9b 100644 --- a/src/depcheck/monado_deps.rs +++ b/src/depcheck/monado_deps.rs @@ -6,7 +6,10 @@ use super::{ }, DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult, }; -use crate::{depcheck::common::dep_libxrandr, linux_distro::LinuxDistro}; +use crate::{ + depcheck::common::{dep_glslc, dep_libxrandr}, + linux_distro::LinuxDistro, +}; use std::collections::HashMap; fn monado_deps() -> Vec { @@ -60,19 +63,7 @@ fn monado_deps() -> Vec { dep_ninja(), dep_gcc(), dep_gpp(), - Dependency { - name: "glslc".into(), - dep_type: DepType::Executable, - filename: "glslc".into(), - packages: HashMap::from([ - (LinuxDistro::Arch, "shaderc".into()), - (LinuxDistro::Debian, "glslc".into()), - (LinuxDistro::Fedora, "glslc".into()), - (LinuxDistro::Alpine, "shaderc".into()), - (LinuxDistro::Gentoo, "media-libs/shaderc".into()), - (LinuxDistro::Suse, "shaderc".into()), - ]), - }, + dep_glslc(), dep_glslang_validator(), Dependency { name: "sdl2".into(), diff --git a/src/depcheck/xrizer_deps.rs b/src/depcheck/xrizer_deps.rs index 83134c1..a43bd20 100644 --- a/src/depcheck/xrizer_deps.rs +++ b/src/depcheck/xrizer_deps.rs @@ -1,22 +1,10 @@ use super::{DepType, DepcheckResultGetMissing, Dependency, DependencyCheckResult}; -use crate::linux_distro::LinuxDistro; +use crate::{depcheck::common::dep_glslc, linux_distro::LinuxDistro}; use std::collections::HashMap; fn xrizer_deps() -> Vec { vec![ - Dependency { - name: "glslc".into(), - dep_type: DepType::Executable, - filename: "glslc".into(), - packages: HashMap::from([ - (LinuxDistro::Arch, "shaderc".into()), - (LinuxDistro::Debian, "glslc".into()), - (LinuxDistro::Fedora, "glslc".into()), - (LinuxDistro::Alpine, "glslc".into()), - (LinuxDistro::Gentoo, "dev-util/glslang".into()), - (LinuxDistro::Suse, "shaderc".into()), - ]), - }, + dep_glslc(), Dependency { name: "libxcb-glx".into(), dep_type: DepType::Include,