feat: ledger-live-git use system electron

4 files changed, 17 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31b5a3e968c5..86b0ba1374d7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ledger-live-git
 	pkgdesc = Ledger Live - Desktop (git-main)
-	pkgver = 2.54.0.r6.g72cbeef
+	pkgver = 2.57.0.r0.g76dda1b
 	pkgrel = 1
 	url = https://github.com/LedgerHQ/ledger-live
 	arch = x86_64
@@ -11,9 +11,12 @@ pkgbase = ledger-live-git
 	makedepends = fnm
 	makedepends = pnpm
 	depends = ledger-udev
+	depends = electron23
 	provides = ledger-live
 	conflicts = ledger-live
 	source = ledger-live-git::git+https://github.com/LedgerHQ/ledger-live#branch=main
+	source = ledger-live-desktop.sh
 	sha512sums = SKIP
+	sha512sums = 15f6703121d1f2df2dab494efd645ef27830b5cff41184483c75a21545d79b183ababb47bebc8571c7f77e562497efc2453c3e41b59e40ad03be2baacf20148e
 
 pkgname = ledger-live-git
diff --git a/PKGBUILD b/PKGBUILD
index ff0ee4f054f6..c3a3dd5ced4d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,17 +7,19 @@ _pkgbin=ledger-live-desktop
 _pkgname=ledger-live
 pkgname=${_pkgname}-git
 pkgdesc="Ledger Live - Desktop (git-main)"
-pkgver=2.54.0.r6.g72cbeef
+pkgver=2.57.0.r0.g76dda1b
 pkgrel=1
 arch=('x86_64')
 url='https://github.com/LedgerHQ/ledger-live'
 license=('MIT')
-depends=('ledger-udev')
+depends=('ledger-udev' 'electron23')
 makedepends=('git' 'python>=3.5' 'node-gyp' 'fnm' 'pnpm')
 provides=("${_pkgname}")
 conflicts=("${_pkgname}")
-source=("${pkgname}::git+${url}#branch=main")
-sha512sums=('SKIP')
+source=("${pkgname}::git+${url}#branch=main"
+        "${_pkgbin}.sh")
+sha512sums=('SKIP'
+            '15f6703121d1f2df2dab494efd645ef27830b5cff41184483c75a21545d79b183ababb47bebc8571c7f77e562497efc2453c3e41b59e40ad03be2baacf20148e')
 
 _fnm_use() {
   export FNM_DIR="${srcdir}/.fnm"
@@ -50,14 +52,14 @@ build() {
 }
 
 package() {
+  install -Dm755 "${_pkgbin}.sh" "${pkgdir}/usr/bin/${_pkgbin}"
+
   cd "${pkgname}/apps/${_pkgbin}"
 
   install -Dm644 "dist/__appImage-x64/${_pkgbin}.desktop" "${pkgdir}/usr/share/applications/${_pkgbin}.desktop"
 
-  install -dm755 "${pkgdir}/opt/${_pkgname}"
-  cp -r "dist/linux-unpacked/." "${pkgdir}/opt/${_pkgname}"
-  install -dm755 "${pkgdir}/usr/bin"
-  ln -s "/opt/${_pkgname}/${_pkgbin}" "${pkgdir}/usr/bin/${_pkgbin}"
+  install -dm755 "${pkgdir}/usr/lib/${_pkgbin}"
+  cp -r "dist/linux-unpacked/resources/app.asar" "${pkgdir}/usr/lib/${_pkgbin}"
 
   install -Dm644 "build/icons/icon.png" "${pkgdir}/usr/share/icons/hicolor/64x64/apps/${_pkgbin}.png"
   for i in 128 256 512 1024; do
diff --git a/ledger-live-desktop.desktop b/ledger-live-desktop.desktop
deleted file mode 100644
index 405128654a94..000000000000
--- a/ledger-live-desktop.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Ledger Live
-Exec=ledger-live-desktop %U
-Terminal=false
-Type=Application
-Icon=ledger-live-desktop
-StartupWMClass=Ledger Live
-Comment=Ledger Live - Desktop
-MimeType=x-scheme-handler/ledgerlive;
-Categories=Finance;
diff --git a/ledger-live-desktop.sh b/ledger-live-desktop.sh
new file mode 100644
index 000000000000..8f2821c7cce2
--- /dev/null
+++ b/ledger-live-desktop.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec electron23 /usr/lib/ledger-live-desktop/app.asar "$@"