From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wCedEeh4+mCxzQAAgWs5BA (envelope-from ) for ; Fri, 23 Jul 2021 10:08:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id SCJRDeh4+mDxIAAAB5/wlQ (envelope-from ) for ; Fri, 23 Jul 2021 08:08:08 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 464562FA4 for ; Fri, 23 Jul 2021 10:08:07 +0200 (CEST) Received: from localhost ([::1]:41774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m6qE2-0004vv-Ac for larch@yhetil.org; Fri, 23 Jul 2021 04:08:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6qDz-0004vl-4Y for guix-patches@gnu.org; Fri, 23 Jul 2021 04:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58902) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m6qDy-000856-T9 for guix-patches@gnu.org; Fri, 23 Jul 2021 04:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m6qDy-00056n-LD for guix-patches@gnu.org; Fri, 23 Jul 2021 04:08:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49705] [PATCH] gnu: gmnisrv: Fix configure flags. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 23 Jul 2021 08:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 49705 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49705@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162702767819624 (code B ref -1); Fri, 23 Jul 2021 08:08:02 +0000 Received: (at submit) by debbugs.gnu.org; 23 Jul 2021 08:07:58 +0000 Received: from localhost ([127.0.0.1]:42215 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6qDu-00056S-6U for submit@debbugs.gnu.org; Fri, 23 Jul 2021 04:07:58 -0400 Received: from lists.gnu.org ([209.51.188.17]:57506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m6qDo-00056H-PB for submit@debbugs.gnu.org; Fri, 23 Jul 2021 04:07:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6qDo-0004v0-6k for guix-patches@gnu.org; Fri, 23 Jul 2021 04:07:52 -0400 Received: from out2.migadu.com ([2001:41d0:2:aacc::]:28260) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m6qDl-0007pV-0n for guix-patches@gnu.org; Fri, 23 Jul 2021 04:07:51 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627027664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aehzI12ycQo6SlhrB/+3vW1GAMNFWnXtjFpWilCh2Q8=; b=Vfu+YsrScsS1ybBTgYjOZ0D5iSk0UISzWJ4/wZZcgQpOUvG9dzCNF35CJGNuZnkzUcLOeB s+yaibotgIDq+H4sXWsgg7RJ9tyyylYQmw11DaVgXP4jd9Jik2wDTLYA5m/ruRjKi2kRbp 7oR1TchoGhiuDUFuoJHYYaWIY/bvGfg= From: Sarah Morgensen Date: Fri, 23 Jul 2021 01:07:42 -0700 Message-Id: <7109666ab6ca0797c583fe62942342a9b0a1be89.1627027028.git.iskarian@mgsn.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:aacc::; envelope-from=iskarian@mgsn.dev; helo=out2.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1627027687; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=aehzI12ycQo6SlhrB/+3vW1GAMNFWnXtjFpWilCh2Q8=; b=KkGX4pGvJyy2oFqPFcYjLCz5zuy3O1YktlguYuo8VeS4GNOmzxjhZwC9G0spg2yPjPMMKH dQDCDF2x5hrxXfMFKBDvVficWCS5huDzwxwi0r83M0mrcoAM6s6blwbMPjhHzg3DxS1I6n Kd7gZ3ELrxcqCaNI2IpMPfT/siKmnhbg2UaMa2EOKaF50pgUALjdPSuTSrCGZaaa/oeQ67 MyC6Ij3qYtXtQ1PlE4X/WpeLqcMaBpN6PvCOWwORmUkniUIF+XB55vPUTjT2CeQWMfmXRp +Gztdw6ETlp9X5Lng9dwcHsvdeKqGKKqUBa4feBIYBG9/GqIjJx2JbmZHwHKBQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627027687; a=rsa-sha256; cv=none; b=DV0Vs8zqXrSZfJ+MeqJI3A6KTT+jvRoJbbOCH0XBz+2mXd+cNjjDUmTehs6J+3SYFH7K3Z M0bldyOADyzJMOfP1aKCHbQ6FY3FkXekXaEWb6xmpWi95rK+QmYsvNu5/QmENnWRY7MeOe iNSjK91Ckc5AHnCSswS0mMtYrXmguDFX9oR5o+VzTYtj5Nt2IvCLzH/y/CoFCPiW3c2mfJ bspcJz+4/m9A3ysmztanR1BwV890FA7nOOhN6y2yNbkLkBDjg9Fp2ogreQ/W10PTZrk9rl c5BWXMxExGJDDeF9h9PVi6MHD+k3RBVtGRx3cb8ZOz9F6JgPDaFa8vStxch0Iw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Vfu+YsrS; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 3.68 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Vfu+YsrS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 464562FA4 X-Spam-Score: 3.68 X-Migadu-Scanner: scn1.migadu.com X-TUID: Wk0akDwdqJMv 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 . 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