wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-24 22:01:47 +03:00
Code Issues Projects Releases Wiki Activity

ci: fixup build on macos where --target is in use

Browse Source
This commit is contained in:
Wez Furlong 2021-02-28 18:51:09 -08:00
parent d56c5178da
commit 1415e9ce4d
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/src/lib.rs
View File

@ -469,9 +469,14 @@ impl ConfigInner {
let mut config = Config::default_config();
config.font_locator = FontLocatorSelection::ConfigDirsOnly;
let exe_name = std::env::current_exe().unwrap();
let exe_dir = exe_name.parent().unwrap();
config.font_dirs.push(exe_dir.join("../../../assets/fonts"));
// If we're building for a specific target, the dir
// level is one deeper.
#[cfg(target_os = "macos")]
config
.font_dirs
.push(exe_name.parent().unwrap().join("../../../assets/fonts"));
.push(exe_dir.join("../../../../assets/fonts"));
// Specify the same DPI used on non-mac systems so
// that we have consistent values regardless of the
// operating system that we're running tests on