From 5d619cd8f04db91b40b87302cc2167d2acf12616 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 31 Mar 2022 18:54:39 -0400
Subject: [PATCH] helix: remove conflict with hex

---
 srcpkgs/helix/files/helix | 2 ++
 srcpkgs/helix/files/hx    | 2 --
 srcpkgs/helix/template    | 7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/helix/files/helix
 delete mode 100644 srcpkgs/helix/files/hx

diff --git a/srcpkgs/helix/files/helix b/srcpkgs/helix/files/helix
new file mode 100644
index 000000000000..26605825df71
--- /dev/null
+++ b/srcpkgs/helix/files/helix
@@ -0,0 +1,2 @@
+#!/bin/sh
+HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/_helix "$@"
diff --git a/srcpkgs/helix/files/hx b/srcpkgs/helix/files/hx
deleted file mode 100644
index a43e49fadc5b..000000000000
--- a/srcpkgs/helix/files/hx
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-HELIX_RUNTIME=/usr/lib/helix/runtime exec /usr/lib/helix/hx "$@"
diff --git a/srcpkgs/helix/template b/srcpkgs/helix/template
index 961a894092b7..399f31d40e03 100644
--- a/srcpkgs/helix/template
+++ b/srcpkgs/helix/template
@@ -1,7 +1,7 @@
 # Template file for 'helix'
 pkgname=helix
 version=22.03
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path helix-term"
 hostmakedepends="git"
@@ -12,7 +12,6 @@ homepage="https://helix-editor.com/"
 changelog="https://github.com/helix-editor/helix/blob/master/CHANGELOG.md"
 distfiles="https://github.com/helix-editor/helix/archive/${version}.tar.gz"
 checksum=a21f4d7b6390930a89b59567909ad7c613a1eeeafc813167ff7bc3be603997f4
-conflicts="hex>=0"
 
 # skip problematic doctests on i686
 case "$XBPS_TARGET_MACHINE" in
@@ -26,7 +25,7 @@ post_install() {
 	rm -rf runtime/grammars/sources
 
 	vmkdir usr/lib/helix
-	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/
+	mv ${DESTDIR}/usr/bin/hx ${DESTDIR}/usr/lib/helix/_helix
 	vcopy runtime usr/lib/helix
-	vbin ${FILESDIR}/hx
+	vbin ${FILESDIR}/helix
 }