summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nongnu/packages/electron.scm27
1 files changed, 10 insertions, 17 deletions
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 @@
17 #:use-module (ice-9 match) 17 #:use-module (ice-9 match)
18 #:use-module (gnu packages compression) 18 #:use-module (gnu packages compression)
19 #:use-module (gnu packages gtk) 19 #:use-module (gnu packages gtk)
20 #:use-module (gnu packages nss)
20 #:use-module (gnu packages video)) 21 #:use-module (gnu packages video))
21 22
22(define (electron-source version hash) 23(define (electron-source version hash)
@@ -46,10 +47,8 @@
46 (arguments 47 (arguments
47 (list 48 (list
48 #:wrapper-plan 49 #:wrapper-plan
49 #~'("electron" 50 #~'(("electron" (("out" "/share/electron")
50 "libffmpeg.so" 51 ("nss" "/lib/nss"))))
51 "libGLESv2.so"
52 "libEGL.so")
53 #:install-plan 52 #:install-plan
54 #~'(("." "share/electron/" #:include 53 #~'(("." "share/electron/" #:include
55 ("electron" 54 ("electron"
@@ -69,20 +68,14 @@
69 ("locales" "share/electron/")) 68 ("locales" "share/electron/"))
70 #:phases 69 #:phases
71 #~(modify-phases %standard-phases 70 #~(modify-phases %standard-phases
72 (add-before 'install-wrapper 'wrap-where-patchelf-does-not-work 71 (add-after 'install 'symlink-binary-file
73 (lambda* (#:key inputs #:allow-other-keys) 72 (lambda _
74 (let ((bin (string-append #$output "/share/electron/electron")) 73 (let ((bin (string-append #$output "/bin")))
75 (wrapper (string-append #$output "/bin/electron"))) 74 (mkdir-p bin)
76 (mkdir-p (dirname wrapper)) 75 (symlink (string-append #$output "/share/electron/electron")
77 (make-wrapper wrapper bin 76 (string-append bin "/electron"))))))))
78 `("LD_LIBRARY_PATH" ":"
79 prefix
80 (,(string-join
81 (list
82 (string-append out "/share/electron"))
83 ":"))))))))))
84 (native-inputs (list unzip)) 77 (native-inputs (list unzip))
85 (inputs (list ffmpeg gdk-pixbuf)) 78 (inputs (list ffmpeg gdk-pixbuf nss))
86 (home-page "https://www.electronjs.org/") 79 (home-page "https://www.electronjs.org/")
87 (synopsis "Cross platform desktop application shell") 80 (synopsis "Cross platform desktop application shell")
88 (description "The Electron framework lets you write cross-platform desktop 81 (description "The Electron framework lets you write cross-platform desktop