nongnu: electron-27: Improve style.

* nongnu/packages/electron.scm (electron-27): Improve style.
  [arguments]: Rewrite using Gexps.
  [inputs, native-inputs]: Remove input labels.

Signed-off-by: Hilton Chain <hako@ultrarare.space>
Modified-by: Hilton Chain <hako@ultrarare.space>
This commit is contained in:
Nicolas Graves 2025-06-21 14:21:19 +02:00 committed by Hilton Chain
parent 3df17f84ac
commit 8e65d6358b
No known key found for this signature in database
GPG key ID: ACC66D09CA528292

View file

@ -5,11 +5,13 @@
;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de> ;;; Copyright © 2024 Jonathan Brielmaier <jonathan.brielmaier@web.de>
;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2025 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me> ;;; Copyright © 2025 Simen Endsjø <contact@simendsjo.me>
;;; Copyright © 2025 Nicolas Graves <ngraves@ngraves.fr>
(define-module (nongnu packages electron) (define-module (nongnu packages electron)
#:use-module (nonguix build-system chromium-binary) #:use-module (nonguix build-system chromium-binary)
#:use-module ((nonguix licenses) :prefix license:) #:use-module ((nonguix licenses) :prefix license:)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match) #:use-module (ice-9 match)
@ -42,47 +44,45 @@
"0qs5n6m0gj0rknjq5aqrbbpqwh2829a1cl51l6xj79p7aiggb9p3")) "0qs5n6m0gj0rknjq5aqrbbpqwh2829a1cl51l6xj79p7aiggb9p3"))
(build-system chromium-binary-build-system) (build-system chromium-binary-build-system)
(arguments (arguments
`(#:wrapper-plan (list
`("electron" #:wrapper-plan
"libffmpeg.so" #~'("electron"
"libGLESv2.so" "libffmpeg.so"
"libEGL.so") "libGLESv2.so"
#:install-plan "libEGL.so")
`(("." "share/electron/" #:include #:install-plan
("electron" #~'(("." "share/electron/" #:include
"chrome-sandbox" ("electron"
"chrome_100_percent.pak" "chrome-sandbox"
"chrome_200_percent.pak" "chrome_100_percent.pak"
"chrome_crashpad_handler" "chrome_200_percent.pak"
"icudtl.dat" "chrome_crashpad_handler"
"resources.pak" "icudtl.dat"
"v8_context_snapshot.bin" "resources.pak"
"version" "v8_context_snapshot.bin"
"libffmpeg.so" "version"
;; electron seems to force-load these from its directory. "libffmpeg.so"
"libEGL.so" ;; electron seems to force-load these from its directory.
"libGLESv2.so")) "libEGL.so"
("resources" "share/electron/") "libGLESv2.so"))
("locales" "share/electron/")) ("resources" "share/electron/")
#:phases ("locales" "share/electron/"))
(modify-phases %standard-phases #:phases
(add-before 'install-wrapper 'wrap-where-patchelf-does-not-work #~(modify-phases %standard-phases
(lambda* (#:key inputs outputs #:allow-other-keys) (add-before 'install-wrapper 'wrap-where-patchelf-does-not-work
(let* ((out (assoc-ref outputs "out")) (lambda* (#:key inputs #:allow-other-keys)
(bin (string-append out "/share/electron/electron")) (let ((bin (string-append #$output "/share/electron/electron"))
(wrapper (string-append out "/bin/electron"))) (wrapper (string-append #$output "/bin/electron")))
(mkdir-p (dirname wrapper)) (mkdir-p (dirname wrapper))
(make-wrapper wrapper bin (make-wrapper wrapper bin
`("LD_LIBRARY_PATH" ":" `("LD_LIBRARY_PATH" ":"
prefix prefix
(,(string-join (,(string-join
(list (list
(string-append out "/share/electron")) (string-append out "/share/electron"))
":"))))) ":"))))))))))
#t))))) (native-inputs (list unzip))
(native-inputs `(("unzip" ,unzip))) (inputs (list ffmpeg gdk-pixbuf))
(inputs `(("gdk-pixbuf" ,gdk-pixbuf)
("ffmpeg" ,ffmpeg)))
(home-page "https://www.electronjs.org/") (home-page "https://www.electronjs.org/")
(synopsis "Cross platform desktop application shell") (synopsis "Cross platform desktop application shell")
(description "The Electron framework lets you write cross-platform desktop (description "The Electron framework lets you write cross-platform desktop