From patchwork Sun Sep 15 12:33:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 15377 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id DB656173CF; Sun, 15 Sep 2019 13:34:57 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,UNPARSEABLE_RELAY, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9D32D1739F for ; Sun, 15 Sep 2019 13:34:57 +0100 (BST) Received: from localhost ([::1]:54376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9Tk1-0007RZ-32 for patchwork@mira.cbaines.net; Sun, 15 Sep 2019 08:34:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51836) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9Tj9-0007Cy-81 for guix-patches@gnu.org; Sun, 15 Sep 2019 08:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9Tj8-0006xD-4J for guix-patches@gnu.org; Sun, 15 Sep 2019 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:38637) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9Tj8-0006x2-1o for guix-patches@gnu.org; Sun, 15 Sep 2019 08:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i9Tj7-0003oR-TD for guix-patches@gnu.org; Sun, 15 Sep 2019 08:34:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37409] [PATCH] gnu: guile-email: Add phase to patch the module directory. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 15 Sep 2019 12:34:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 37409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37409@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156855082114626 (code B ref -1); Sun, 15 Sep 2019 12:34:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Sep 2019 12:33:41 +0000 Received: from localhost ([127.0.0.1]:47458 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i9Tim-0003nq-O3 for submit@debbugs.gnu.org; Sun, 15 Sep 2019 08:33:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:33818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i9Tik-0003ni-8D for submit@debbugs.gnu.org; Sun, 15 Sep 2019 08:33:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9Tii-0006w1-8k for guix-patches@gnu.org; Sun, 15 Sep 2019 08:33:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9Tig-0006nG-1f for guix-patches@gnu.org; Sun, 15 Sep 2019 08:33:36 -0400 Received: from mira.cbaines.net ([2a01:7e00::f03c:91ff:fe69:8da9]:46806) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1i9Tif-0006mj-RC for guix-patches@gnu.org; Sun, 15 Sep 2019 08:33:33 -0400 Received: from localhost (cpc102582-walt20-2-0-cust14.13-2.cable.virginm.net [86.27.34.15]) by mira.cbaines.net (Postfix) with ESMTPSA id 020EB17381 for ; Sun, 15 Sep 2019 13:33:31 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id faffb8c0 for ; Sun, 15 Sep 2019 12:33:31 +0000 (UTC) From: Christopher Baines Date: Sun, 15 Sep 2019 13:33:31 +0100 Message-Id: <20190915123331.22860-1-mail@cbaines.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Otherwise the .go files appear within share, and Guile doesn't find them. With this patch they appear in lib within the output. One thing this means is that stack traces include the filenames. * gnu/packages/guile-xyz.scm (guile-email)[arguments]: Add 'patch-module-dir phase. --- gnu/packages/guile-xyz.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b765ef36e1..4fa2759205 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -927,7 +927,16 @@ tracker's SOAP service, such as @url{https://bugs.gnu.org}.") (inputs `(("guile" ,guile-2.2))) (arguments - '(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ; to prevent guild warnings + '(#:make-flags '("GUILE_AUTO_COMPILE=0") ; to prevent guild warnings + #:phases + (modify-phases %standard-phases + (add-before 'configure 'patch-module-dir + (lambda _ + (substitute* "Makefile.in" + (("^godir = ([[:graph:]]+)") + "godir = \ +$(libdir)/guile/@GUILE_EFFECTIVE_VERSION@/site-ccache\n")) + #t))))) (home-page "https://guile-email.systemreboot.net") (synopsis "Guile email parser") (description "guile-email is a collection of email utilities implemented