From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 61391@debbugs.gnu.org
Cc: Jonathan Brielmaier <jonathan.brielmaier@web.de>,
Maxim Cournoyer <maxim.cournoyer@gmail.com>
Subject: [bug#61391] [PATCH 1/6] gnu: icedove-wayland: Use gexps.
Date: Thu, 9 Feb 2023 11:37:38 -0500 [thread overview]
Message-ID: <20230209163744.28973-2-maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <20230209163006.28078-1-maxim.cournoyer@gmail.com>
* gnu/packages/gnuzilla.scm (icedove/wayland)
[inputs]: Set to the empty list.
[arguments]: Use gexps.
---
gnu/packages/gnuzilla.scm | 35 ++++++++++++++---------------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 0b39774a2e..15472ffed2 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -1420,37 +1420,30 @@ (define-public icedove/wayland
(package
(inherit icedove)
(name "icedove-wayland")
- (native-inputs '())
- (inputs
- `(("bash" ,bash-minimal)
- ("icedove" ,icedove)))
(build-system trivial-build-system)
(arguments
- '(#:modules ((guix build utils))
- #:builder
- (begin
+ (list
+ #:modules '((guix build utils))
+ #:builder
+ #~(begin
(use-modules (guix build utils))
- (let* ((bash (assoc-ref %build-inputs "bash"))
- (icedove (assoc-ref %build-inputs "icedove"))
- (out (assoc-ref %outputs "out"))
- (exe (string-append out "/bin/icedove")))
+ (let* ((exe (string-append #$output "/bin/icedove")))
(mkdir-p (dirname exe))
-
(call-with-output-file exe
(lambda (port)
(format port "#!~a
MOZ_ENABLE_WAYLAND=1 exec ~a $@"
- (string-append bash "/bin/bash")
- (string-append icedove "/bin/icedove"))))
+ #$(file-append bash-minimal "/bin/bash")
+ #$(file-append icedove "/bin/icedove"))))
(chmod exe #o555)
-
;; Provide the manual and .desktop file.
- (copy-recursively (string-append icedove "/share")
- (string-append out "/share"))
- (substitute* (string-append
- out "/share/applications/icedove.desktop")
- ((icedove) out))
- #t))))))
+ (copy-recursively (string-append #$icedove "/share")
+ (string-append #$output "/share"))
+ (substitute* (string-append #$output
+ "/share/applications/icedove.desktop")
+ ((#$icedove) #$output))))))
+ (native-inputs '())
+ (inputs '())))
(define-public firefox-decrypt
(package
--
2.39.1
next prev parent reply other threads:[~2023-02-09 16:39 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-09 16:30 [bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling) Maxim Cournoyer
2023-02-09 16:37 ` Maxim Cournoyer [this message]
2023-02-09 16:37 ` [bug#61391] [PATCH 2/6] gnu: Add nspr-next Maxim Cournoyer
2023-02-09 16:37 ` [bug#61391] [PATCH 3/6] gnu: Add nss-next Maxim Cournoyer
2023-02-09 16:37 ` [bug#61391] [PATCH 4/6] gnu: icedove: Unbundle NSS Maxim Cournoyer
2023-02-09 21:40 ` [bug#61391] [PATCH 0/6] Improvements to Icedove (icons, gexps, un-bundling) Morgan Smith
2023-02-10 4:50 ` Maxim Cournoyer
2023-02-10 6:02 ` Morgan Smith
2023-02-10 20:48 ` Maxim Cournoyer
2023-02-12 4:53 ` Morgan Smith
2023-02-13 21:20 ` bug#61391: " Maxim Cournoyer
2023-02-09 16:37 ` [bug#61391] [PATCH 5/6] gnu: icedove: Use more gexps Maxim Cournoyer
2023-02-09 16:37 ` [bug#61391] [PATCH 6/6] gnu: icedove: Install icons Maxim Cournoyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230209163744.28973-2-maxim.cournoyer@gmail.com \
--to=maxim.cournoyer@gmail.com \
--cc=61391@debbugs.gnu.org \
--cc=jonathan.brielmaier@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).