From: Sarah Morgensen <iskarian@mgsn.dev>
To: 49705@debbugs.gnu.org
Subject: [bug#49705] [PATCH] gnu: gmnisrv: Fix configure flags.
Date: Fri, 23 Jul 2021 01:07:42 -0700 [thread overview]
Message-ID: <7109666ab6ca0797c583fe62942342a9b0a1be89.1627027028.git.iskarian@mgsn.dev> (raw)
Remove the dependency on /etc/mime.types (fixes #49233). Look in /etc
for configuration files rather than /gnu/store/...-gmnisrv.../etc.
* gnu/packages/web.scm (gmnisrv)[arguments]<#:phases> Move logic to...
<#:tests?>: ...here...
<#:make-flags>: ...and here.
<#:configure-flags>: Set --sysconfdir and --with-mimedb.
[propagated-inputs]: Move mailcap to...
[inputs]: ...here (/etc/mime.types is no longer needed).
---
Built, linted, and manually tested. Fixes <https://issues.guix.gnu.org/49233>.
gnu/packages/web.scm | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 2cc8619b19..12ba55cdc8 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -7985,20 +7985,19 @@ solution for any project's interface needs:
(file-name (git-file-name name version))))
(build-system gnu-build-system)
(arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'set-variables
- (lambda _
- (setenv "CC" "gcc")
- #t))
- (delete 'check))))
+ `(#:tests? #f ; no tests
+ #:configure-flags
+ (list "--sysconfdir=/etc"
+ (string-append "--with-mimedb="
+ (assoc-ref %build-inputs "mailcap")
+ "/etc/mime.types"))
+ #:make-flags '("CC=gcc")))
(inputs
- `(("openssl" ,openssl)))
+ `(("mailcap" ,mailcap)
+ ("openssl" ,openssl)))
(native-inputs
`(("pkg-config" ,pkg-config)
("scdoc" ,scdoc)))
- (propagated-inputs
- `(("mailcap" ,mailcap)))
(synopsis "Simple Gemini protocol server")
(description "gmnisrv is a simple Gemini protocol server written in C.")
(license (list license:gpl3+
base-commit: 89ea0918a4a6cc9c250b85c0b713e471b7769c48
--
2.31.1
next reply other threads:[~2021-07-23 8:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 8:07 Sarah Morgensen [this message]
2021-07-25 14:23 ` [bug#49705] [PATCH] gnu: gmnisrv: Fix configure flags Arun Isaac
2021-07-25 20:37 ` [bug#49705] [PATCH v2 0/4] " Sarah Morgensen
2021-07-25 20:39 ` [bug#49705] [PATCH v2 1/4] gnu: gmnisrv: Disable tests using #:tests? Sarah Morgensen
2021-07-25 20:39 ` [bug#49705] [PATCH v2 2/4] gnu: gmnisrv: Use #:make-flags, and cross-compile Sarah Morgensen
2021-07-25 20:39 ` [bug#49705] [PATCH v2 3/4] gnu: gmnisrv: Remove dependency on /etc/mime.types Sarah Morgensen
2021-07-25 20:39 ` [bug#49705] [PATCH v2 4/4] gnu: gmnisrv: Fix configuration search path Sarah Morgensen
2021-07-26 21:18 ` bug#49705: [PATCH v2 0/4] gnu: gmnisrv: Fix configure flags Arun Isaac
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=7109666ab6ca0797c583fe62942342a9b0a1be89.1627027028.git.iskarian@mgsn.dev \
--to=iskarian@mgsn.dev \
--cc=49705@debbugs.gnu.org \
/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).