Skip to content

chore: update mac env.rs to modernize application bundle #1577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore: update mac env.rs to modernize application bundle #1577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions crates/rnote-ui/src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ pub(crate) fn lib_dir() -> anyhow::Result<PathBuf> {
let canonicalized_exec_dir = exec_parent_dir()?.canonicalize()?;

if macos_is_in_app_bundle(&canonicalized_exec_dir) {
Ok(canonicalized_exec_dir.join("../Resources/lib"))
Ok(canonicalized_exec_dir.join("../Frameworks"))
} else {
Ok(PathBuf::from(config::LIBDIR))
}
Expand Down Expand Up @@ -82,14 +82,14 @@ pub(crate) fn setup_env() -> anyhow::Result<()> {

if macos_is_in_app_bundle(canonicalized_exec_dir) {
let data_dir = data_dir()?;
let lib_dir = lib_dir()?;
let resources_dir = exec_parent_dir()?.canonicalize()?.join("../Resources");

// SAFETY: this setup only happens while still being single-threaded
unsafe {
std::env::set_var("XDG_DATA_DIRS", data_dir);
std::env::set_var(
"GDK_PIXBUF_MODULE_FILE",
lib_dir.join("gdk-pixbuf-2.0/2.10.0/loaders.cache"),
resources_dir.join("/etc/loaders.cache"),
);
}
}
Expand Down