Commit
Author: Manos Pitsidianakis [manos@pitsidianak.is]
Hash: 2084ce93756ea358ca826a33af014fad542ad07c
Timestamp: Sat, 10 Aug 2024 09:50:44 +0000 (5 months ago)

+4 -1 +/-1 browse
Fix invalid cfg feature combinations for macos
Fix invalid cfg feature combinations for macos

NOTMUCH_ERROR_DETAILS was defined twice for macos from "unix"
target_family and target_os = "macos".

Signed-off-by: Manos Pitsidianakis <manos@pitsidianak.is>
1diff --git a/melib/src/backends.rs b/melib/src/backends.rs
2index 29f6a17..bc3cf37 100644
3--- a/melib/src/backends.rs
4+++ b/melib/src/backends.rs
5 @@ -113,7 +113,10 @@ pub const NOTMUCH_ERROR_MSG: &str = "this version of meli is not compiled with n
6 #[cfg(not(feature = "notmuch"))]
7 pub const NOTMUCH_ERROR_DETAILS: &str = "";
8
9- #[cfg(all(feature = "notmuch", target_family = "unix"))]
10+ #[cfg(all(
11+ feature = "notmuch",
12+ all(target_family = "unix", not(target_os = "macos"))
13+ ))]
14 pub const NOTMUCH_ERROR_DETAILS: &str = r#"If you have installed the library manually, try setting the `LD_LIBRARY_PATH` environment variable to its `lib` directory. Otherwise, set it to the location of libnotmuch.5.so. Example:
15
16 LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/path/to/notmuch/lib" meli