guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#49705] [PATCH] gnu: gmnisrv: Fix configure flags.


From: Sarah Morgensen
Subject: [bug#49705] [PATCH] gnu: gmnisrv: Fix configure flags.
Date: Fri, 23 Jul 2021 01:07:42 -0700

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






reply via email to

[Prev in Thread] Current Thread [Next in Thread]