From d798a74b254ec6ec712981367da58902c99533d7 Mon Sep 17 00:00:00 2001
From: Giacomo Leidi <goodoldpaul@autistici.org>
Date: Mon, 12 Jun 2023 00:39:14 +0200
Subject: nongnu: electron: Use chromium-binary-build-system.

* 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>
---
 nongnu/packages/electron.scm | 65 ++++++++------------------------------------
 1 file changed, 11 insertions(+), 54 deletions(-)

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

diff --git a/nongnu/packages/electron.scm b/nongnu/packages/electron.scm
index ffe71cd..c3e201e 100644
--- a/nongnu/packages/electron.scm
+++ b/nongnu/packages/electron.scm
@@ -1,24 +1,16 @@
 ;;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;; Copyright © 2023 Pierre Neidhardt <mail@ambrevar.xyz>
+;;; Copyright © 2023 Giacomo Leidi <goodoldpaul@autistici.org>
 
 (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 (guix download)
   #:use-module (guix packages)
   #:use-module (guix utils)
   #:use-module (ice-9 match)
   #:use-module (gnu packages compression)
-  #:use-module (gnu packages glib)
-  #:use-module (gnu packages nss)
   #: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))
 
 (define-public electron
@@ -38,20 +30,13 @@
                   ("armhf-linux" "linux-armv7l"))
                 ".zip"))
               (sha256 (base32 "04vmqr5547059751yxr729ljqahal57lymyglaa5xzpw5bfq0xwd"))))
-    (build-system binary-build-system)
+    (build-system chromium-binary-build-system)
     (arguments
-     `(#:patchelf-plan
-       `(("electron"
-          ("glib" "atk" "libx11" "dbus" "gdk-pixbuf" "gtk+" "pango"
-           "cairo" "libxcomposite" "libxdamage" "libxext" "libxfixes"
-           "libxrandr" "expat" "libdrm" "libxkbcommon" "mesa" "alsa-lib"
-           "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")))
+     `(#:wrapper-plan
+       `("electron"
+         "libffmpeg.so"
+         "libGLESv2.so"
+         "libEGL.so")
        #:install-plan
        `(("." "share/electron/" #:include
           ("electron"
@@ -71,7 +56,7 @@
          ("locales" "share/electron/"))
        #: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)
              (let* ((out (assoc-ref outputs "out"))
                     (bin (string-append out "/share/electron/electron"))
@@ -82,40 +67,12 @@
                                prefix
                                (,(string-join
                                   (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"))
                                   ":")))))
              #t)))))
     (native-inputs `(("unzip" ,unzip)))
-    (inputs `(("glib" ,glib)
-              ("nss" ,nss)
-              ("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)))
+    (inputs `(("gdk-pixbuf" ,gdk-pixbuf)
+              ("ffmpeg" ,ffmpeg)))
     (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