infra/nonguix
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nongnu: electron: Use chromium-binary-build-system.

Browse Source 
* nongnu/packages/electron.scm (define-module): Remove no longer
required modules
(electron)[build-system]: Use chromium-binary-build-system.
[patchelf-plan]: Drop it since the build system figures it out from the
wrapper plan;
[wrapper-plan]: New argument;
[phases]: Adjust to chromium-build-system;
[inputs]: Drop the inputs provided by the build system.

Signed-off-by: Jonathan Brielmaier <jonathan.brielmaier@web.de>
This commit is contained in:
Giacomo Leidi 2023-06-12 00:39:14 +02:00 committed by Jonathan Brielmaier
parent 325e4d8d1b
commit d798a74b25
No known key found for this signature in database
GPG Key ID: ECFC83988B4E4B9F
1 changed files with 11 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
nongnu/packages/electron.scm
View File

@ -1,24 +1,16 @@
;;; SPDX-License-Identifier: GPL-3.0-or-later ;;; SPDX-License-Identifier: GPL-3.0-or-later
;;; Copyright © 2023 Pierre Neidhardt <mail@ambrevar.xyz> ;;; Copyright © 2023 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
(define-module (nongnu packages electron) (define-module (nongnu packages electron)
#:use-module (nonguix build-system 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 packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages nss)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages xorg)
#:use-module (gnu packages xml)
#:use-module (gnu packages xdisorg)
#:use-module (gnu packages gl)
#:use-module (gnu packages linux)
#:use-module (gnu packages cups)
#:use-module (gnu packages gcc)
#:use-module (gnu packages video)) #:use-module (gnu packages video))
(define-public electron (define-public electron
@ -38,20 +30,13 @@
("armhf-linux" "linux-armv7l")) ("armhf-linux" "linux-armv7l"))
".zip")) ".zip"))
(sha256 (base32 "04vmqr5547059751yxr729ljqahal57lymyglaa5xzpw5bfq0xwd")))) (sha256 (base32 "04vmqr5547059751yxr729ljqahal57lymyglaa5xzpw5bfq0xwd"))))
(build-system binary-build-system) (build-system chromium-binary-build-system)
(arguments (arguments
`(#:patchelf-plan `(#:wrapper-plan
`(("electron" `("electron"
("glib" "atk" "libx11" "dbus" "gdk-pixbuf" "gtk+" "pango" "libffmpeg.so"
"cairo" "libxcomposite" "libxdamage" "libxext" "libxfixes" "libGLESv2.so"
"libxrandr" "expat" "libdrm" "libxkbcommon" "mesa" "alsa-lib" "libEGL.so")
"cups" "at-spi2-core" "gcc:lib" "libxcb" "at-spi2-atk" "nspr"))
("libffmpeg.so"
("gcc:lib"))
("libGLESv2.so"
("gcc:lib" "libx11" "libxcb" "libxext"))
("libEGL.so"
("gcc:lib")))
#:install-plan #:install-plan
`(("." "share/electron/" #:include `(("." "share/electron/" #:include
("electron" ("electron"
@ -71,7 +56,7 @@
("locales" "share/electron/")) ("locales" "share/electron/"))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'install 'wrap-where-patchelf-does-not-work (add-before 'install-wrapper 'wrap-where-patchelf-does-not-work
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/share/electron/electron")) (bin (string-append out "/share/electron/electron"))
@ -82,40 +67,12 @@
prefix prefix
(,(string-join (,(string-join
(list (list
(string-append (assoc-ref inputs "nss") "/lib/nss")
(string-append (assoc-ref inputs "eudev") "/lib")
(string-append (assoc-ref inputs "mesa") "/lib")
(string-append out "/share/electron")) (string-append out "/share/electron"))
":"))))) ":")))))
#t))))) #t)))))
(native-inputs `(("unzip" ,unzip))) (native-inputs `(("unzip" ,unzip)))
(inputs `(("glib" ,glib) (inputs `(("gdk-pixbuf" ,gdk-pixbuf)
("nss" ,nss) ("ffmpeg" ,ffmpeg)))
("nspr" ,nspr)
("atk" ,atk)
("libx11" ,libx11)
("dbus" ,dbus)
("gdk-pixbuf" ,gdk-pixbuf)
("gtk+" ,gtk+)
("pango" ,pango)
("cairo" ,cairo)
("ffmpeg" ,ffmpeg)
("libxcomposite" ,libxcomposite)
("libxdamage" ,libxdamage)
("libxext" ,libxext)
("libxfixes" ,libxfixes)
("libxrandr" ,libxrandr)
("expat" ,expat)
("libdrm" ,libdrm)
("libxkbcommon" ,libxkbcommon)
("mesa" ,mesa)
("alsa-lib" ,alsa-lib)
("cups" ,cups)
("at-spi2-core" ,at-spi2-core)
("gcc:lib" ,gcc "lib")
("libxcb" ,libxcb)
("at-spi2-atk" ,at-spi2-atk)
("eudev" ,eudev)))
(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