diff options
Diffstat (limited to 'editors/helix/files')
-rw-r--r-- | editors/helix/files/patch-helix-core_src_lib.rs | 11 | ||||
-rw-r--r-- | editors/helix/files/patch-helix-loader_src_grammar.rs | 12 | ||||
-rw-r--r-- | editors/helix/files/patch-helix-loader_src_lib.rs | 11 | ||||
-rw-r--r-- | editors/helix/files/patch-helix-term_build.rs | 16 |
4 files changed, 39 insertions, 11 deletions
diff --git a/editors/helix/files/patch-helix-core_src_lib.rs b/editors/helix/files/patch-helix-core_src_lib.rs deleted file mode 100644 index ee8dfd910530..000000000000 --- a/editors/helix/files/patch-helix-core_src_lib.rs +++ /dev/null @@ -1,11 +0,0 @@ ---- helix-core/src/lib.rs.orig 2021-09-18 05:55:12 UTC -+++ helix-core/src/lib.rs -@@ -73,6 +73,8 @@ pub fn runtime_dir() -> std::path::PathBuf { - // this is the directory of the crate being run by cargo, we need the workspace path so we take the parent - return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR); - } -+ -+ return std::path::PathBuf::from("%%DATADIR%%").join(RT_DIR); - - // fallback to location of the executable being run - std::env::current_exe() diff --git a/editors/helix/files/patch-helix-loader_src_grammar.rs b/editors/helix/files/patch-helix-loader_src_grammar.rs new file mode 100644 index 000000000000..4fd2e1f10026 --- /dev/null +++ b/editors/helix/files/patch-helix-loader_src_grammar.rs @@ -0,0 +1,12 @@ +--- helix-loader/src/grammar.rs.orig 2022-03-30 19:54:07 UTC ++++ helix-loader/src/grammar.rs +@@ -79,8 +79,7 @@ pub fn fetch_grammars() -> Result<()> { + // We do not need to fetch local grammars. + let mut grammars = get_grammar_configs()?; + grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. })); +- +- run_parallel(grammars, fetch_grammar, "fetch") ++ Ok(()) + } + + pub fn build_grammars() -> Result<()> { diff --git a/editors/helix/files/patch-helix-loader_src_lib.rs b/editors/helix/files/patch-helix-loader_src_lib.rs new file mode 100644 index 000000000000..4628916f98f7 --- /dev/null +++ b/editors/helix/files/patch-helix-loader_src_lib.rs @@ -0,0 +1,11 @@ +--- helix-loader/src/lib.rs.orig 2022-03-30 18:53:07 UTC ++++ helix-loader/src/lib.rs +@@ -21,6 +21,8 @@ pub fn runtime_dir() -> std::path::PathBuf { + return std::path::PathBuf::from(dir).parent().unwrap().join(RT_DIR); + } + ++ return std::path::PathBuf::from("%%DATADIR%%").join(RT_DIR); ++ + // fallback to location of the executable being run + std::env::current_exe() + .ok() diff --git a/editors/helix/files/patch-helix-term_build.rs b/editors/helix/files/patch-helix-term_build.rs new file mode 100644 index 000000000000..ae7e8f7ff3f0 --- /dev/null +++ b/editors/helix/files/patch-helix-term_build.rs @@ -0,0 +1,16 @@ +--- helix-term/build.rs.orig 2022-03-30 19:59:17 UTC ++++ helix-term/build.rs +@@ -5,12 +5,7 @@ use std::process::Command; + const VERSION: &str = include_str!("../VERSION"); + + fn main() { +- let git_hash = Command::new("git") +- .args(&["rev-parse", "HEAD"]) +- .output() +- .ok() +- .filter(|output| output.status.success()) +- .and_then(|x| String::from_utf8(x.stdout).ok()); ++ let git_hash: Option<&String> = None; + + let version: Cow<_> = match git_hash { + Some(git_hash) => format!("{} ({})", VERSION, &git_hash[..8]).into(), |