From 5da15445211e30539222288dd31c48288bb457ec Mon Sep 17 00:00:00 2001
From: Nicolas Graves <ngraves@ngraves.fr>
Date: Sat, 21 Jun 2025 15:04:18 +0200
Subject: nongnu: electron: Use extended wrapper-plan syntax.

* nongnu/packages/electron.scm (electron-27)
[#:wrapper-plan]: Use extended wrapper-plan syntax.
[#:phases]<wrap-where-patchelf-does-not-work>: Replace it with...
<symlink-binary-file>: ...this lighter phase.
[inputs]: Add nss, necessary for the RUNPATH.

Signed-off-by: Hilton Chain <hako@ultrarare.space>
Modified-by: Hilton Chain <hako@ultrarare.space>
---
 nongnu/packages/electron.scm | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'nongnu/packages/electron.scm')

diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm
index d424cba..edf5ded 100644
--- a/nongnu/packages/electron.scm
+++ b/nongnu/packages/electron.scm
@@ -17,6 +17,7 @@
   #:use-module (ice-9 match)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages nss)
   #:use-module (gnu packages video))
 
 (define (electron-source version hash)
@@ -46,10 +47,8 @@
     (arguments
      (list
       #:wrapper-plan
-      #~'("electron"
-          "libffmpeg.so"
-          "libGLESv2.so"
-          "libEGL.so")
+      #~'(("electron" (("out" "/share/electron")
+                       ("nss" "/lib/nss"))))
       #:install-plan
       #~'(("." "share/electron/" #:include
            ("electron"
@@ -69,20 +68,14 @@
           ("locales" "share/electron/"))
       #:phases
       #~(modify-phases %standard-phases
-          (add-before 'install-wrapper 'wrap-where-patchelf-does-not-work
-            (lambda* (#:key inputs #:allow-other-keys)
-              (let ((bin (string-append #$output "/share/electron/electron"))
-                    (wrapper (string-append #$output "/bin/electron")))
-                (mkdir-p (dirname wrapper))
-                (make-wrapper wrapper bin
-                              `("LD_LIBRARY_PATH" ":"
-                                prefix
-                                (,(string-join
-                                   (list
-                                    (string-append out "/share/electron"))
-                                   ":"))))))))))
+          (add-after 'install 'symlink-binary-file
+            (lambda _
+              (let ((bin (string-append #$output "/bin")))
+                (mkdir-p bin)
+                (symlink (string-append #$output "/share/electron/electron")
+                         (string-append bin "/electron"))))))))
     (native-inputs (list unzip))
-    (inputs (list ffmpeg gdk-pixbuf))
+    (inputs (list ffmpeg gdk-pixbuf nss))
     (home-page "https://www.electronjs.org/")
     (synopsis "Cross platform desktop application shell")
     (description "The Electron framework lets you write cross-platform desktop
-- 
cgit v1.2.3