siguix: emacs-lucid: Clean up declaration.

* siguix/packages/emacs.scm (emacs-lucid): Modify inputs list.

1 files changed, 6 insertions, 60 deletions

diff --git a/siguix/packages/emacs.scm b/siguix/packages/emacs.scm
index 6c4e2d9..6dc13be 100644
--- a/siguix/packages/emacs.scm
+++ b/siguix/packages/emacs.scm
@@ -24,7 +24,7 @@
 ;;; Copyright © 2020 Morgan Smith <Morgan.J.Smith@outlook.com>
 ;;; Copyright © 2021 Simon Streit <simon@netpanic.org>
 ;;;
-;;; This file is not part of GNU Guix.
+;;; This file is NOT part of GNU Guix.
 ;;;
 ;;; GNU Guix is free software; you can redistribute it and/or modify it
 ;;; under the terms of the GNU General Public License as published by
@@ -81,6 +81,7 @@
 (define-public emacs-lucid
   (package/inherit emacs
     (name "emacs-lucid")
+
     (arguments
      `(#:tests? #f                      ; no check target
        #:configure-flags (list "--with-modules"
@@ -88,8 +89,7 @@
                                ;; "--disable-build-details"
                                "--with-x-toolkit=lucid"
                                "--without-gconf"
-                               "--without-gsettings"
-                               )
+                               "--without-gsettings")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-program-file-names
@@ -207,60 +207,6 @@
                             ;; environment variables from emacs.
                             ;; Likewise, we don't need to patch helper binaries
                             ;; like etags, ctags or ebrowse.
-                            "^emacs(-[0-9]+(\\.[0-9]+)*)?$"))
-               #t)))
-         (add-before 'reset-gzip-timestamps 'make-compressed-files-writable
-           ;; The 'reset-gzip-timestamps phase will throw a permission error
-           ;; if gzip files aren't writable then.  This phase is needed when
-           ;; building from a git checkout.
-           (lambda _
-             (for-each make-file-writable
-                       (find-files %output ".*\\.t?gz$"))
-             #t)))))
-    (inputs
-     `(("gnutls" ,gnutls)
-       ("ncurses" ,ncurses)
-
-       ;; Required for "core" functionality, such as dired and compression.
-       ("coreutils" ,coreutils)
-       ("gzip" ,gzip)
-
-       ;; Avoid Emacs's limited movemail substitute that retrieves POP3 email
-       ;; only via insecure channels.  This is not needed for (modern) IMAP.
-       ("mailutils" ,mailutils)
-
-       ;; TODO: Add the optional dependencies.
-       ("gpm" ,gpm)
-       ("libx11" ,libx11)
-       ("libxaw" ,libxaw)
-       ("gtk+" ,gtk+)
-       ("cairo" ,cairo)
-       ("pango" ,pango)
-       ("harfbuzz" ,harfbuzz)
-       ("libxft" ,libxft)
-       ("libtiff" ,libtiff)
-       ("giflib" ,giflib)
-       ("libjpeg" ,libjpeg-turbo)
-       ("acl" ,acl)
-       ("jansson" ,jansson)
-       ("gmp" ,gmp)
-       ("ghostscript" ,ghostscript)
-       ("poppler" ,poppler)
-
-       ;; When looking for libpng `configure' links with `-lpng -lz', so we
-       ;; must also provide zlib as an input.
-       ("libpng" ,libpng)
-       ("zlib" ,zlib)
-       ("librsvg" ,@(if (target-x86-64?)
-                         (list librsvg-bootstrap)
-                         (list librsvg-2.40)))
-       ("libxpm" ,libxpm)
-       ("libxml2" ,libxml2)
-       ("libice" ,libice)
-       ("libsm" ,libsm)
-       ("alsa-lib" ,alsa-lib)
-       ("dbus" ,dbus)
-
-       ;; multilingualization support
-       ("libotf" ,libotf)
-       ("m17n-lib" ,m17n-lib)))))
+                            "^emacs(-[0-9]+(\\.[0-9]+)*)?$"))))))))
+    (inputs (modify-inputs (package-inputs emacs)
+              (append libxaw)))))