diff --git a/src/dependencies/basalt_deps.rs b/src/dependencies/basalt_deps.rs index 816235d..4a75589 100644 --- a/src/dependencies/basalt_deps.rs +++ b/src/dependencies/basalt_deps.rs @@ -1,6 +1,6 @@ use crate::{ depcheck::{DepType, Dependency, DependencyCheckResult}, - dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_ninja, dep_opencv}, + dependencies::common::{dep_cmake, dep_eigen, dep_gpp, dep_libglvnd, dep_ninja, dep_opencv}, linux_distro::LinuxDistro, }; use std::collections::HashMap; @@ -10,19 +10,7 @@ fn basalt_deps() -> Vec { dep_gpp(), dep_cmake(), dep_ninja(), - Dependency { - name: "libglvnd-dev".into(), - dep_type: DepType::Include, - filename: "GL/gl.h".into(), - packages: HashMap::from([ - (LinuxDistro::Arch, "libglvnd".into()), - (LinuxDistro::Debian, "libglvnd-dev".into()), - (LinuxDistro::Fedora, "libglvnd-devel".into()), - // WARN: can't find anything exact for alpine, mesa-dev offers - // GL/gl.h hopefully that's the only one needed - (LinuxDistro::Alpine, "mesa-dev".into()), - ]), - }, + dep_libglvnd(), Dependency { name: "lz4-dev".into(), dep_type: DepType::Include, diff --git a/src/dependencies/common.rs b/src/dependencies/common.rs index 0d0f6a5..0ef05dc 100644 --- a/src/dependencies/common.rs +++ b/src/dependencies/common.rs @@ -208,3 +208,19 @@ pub fn dep_libudev() -> Dependency { ]), } } + +pub fn dep_libglvnd() -> Dependency { + Dependency { + name: "libglvnd-dev".into(), + dep_type: DepType::Include, + filename: "GL/gl.h".into(), + packages: HashMap::from([ + (LinuxDistro::Arch, "libglvnd".into()), + (LinuxDistro::Debian, "libglvnd-dev".into()), + (LinuxDistro::Fedora, "libglvnd-devel".into()), + // WARN: can't find anything exact for alpine, mesa-dev offers + // GL/gl.h hopefully that's the only one needed + (LinuxDistro::Alpine, "mesa-dev".into()), + ]), + } +} diff --git a/src/dependencies/monado_deps.rs b/src/dependencies/monado_deps.rs index c3822a4..74da3d6 100644 --- a/src/dependencies/monado_deps.rs +++ b/src/dependencies/monado_deps.rs @@ -2,7 +2,8 @@ use crate::{ depcheck::{DepType, Dependency, DependencyCheckResult}, dependencies::common::{ dep_cmake, dep_eigen, dep_gcc, dep_git, dep_glslang_validator, dep_gpp, dep_libdrm, - dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers, dep_vulkan_icd_loader, + dep_libglvnd, dep_libudev, dep_ninja, dep_openxr, dep_vulkan_headers, + dep_vulkan_icd_loader, }, linux_distro::LinuxDistro, }; @@ -67,6 +68,7 @@ fn monado_deps() -> Vec { (LinuxDistro::Suse, "Mesa-dri-devel".into()), ]), }, + dep_libglvnd(), ] }