From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 8kZrH0JDb2CgZgEAgWs5BA (envelope-from ) for ; Thu, 08 Apr 2021 19:54:10 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AKk5GEJDb2DSWAAA1q6Kng (envelope-from ) for ; Thu, 08 Apr 2021 17:54:10 +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 29B33FA6C for ; Thu, 8 Apr 2021 19:54:10 +0200 (CEST) Received: from localhost ([::1]:40304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYr3-0007ry-8E for larch@yhetil.org; Thu, 08 Apr 2021 13:54:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40276) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYpB-0005wD-As for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:13 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36743) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYp5-0004z5-JI for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYp5-0003rO-Iq for guix-patches@gnu.org; Thu, 08 Apr 2021 13:52:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 30/33] gnu: emacs-w3m: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:52:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161790430614677 (code B ref 47661); Thu, 08 Apr 2021 17:52:07 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:51:46 +0000 Received: from localhost ([127.0.0.1]:48267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoj-0003oW-PX for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:46 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:14366) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYoW-0003nS-Nh for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:51:33 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTN22Cq6z1LWpG for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:51:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTN22Cq6z1LWpG DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904290; bh=KB39wTovS1cKXYQx8pn1IiwD+Hs9nWvLDWQgDWAUv4U=; h=From:To:Subject:Date:In-Reply-To:References:From; b=P+bhEYtpCGJpOYx8p/rucSROcIKiDOykmpR/LthxnDvYX1S83LpI/Bd5CWyBsnC5y /zPGlxgKB8STu+byoQpopLuWPBqHfohIdU35YeHhenEO1Yml2r/DnVHV6w/3/rRCa9 2GM2zcg86mSysyNgiFfQ9P1ozedQXq5lUUZXfeKc= From: Leo Prikler Date: Thu, 8 Apr 2021 19:50:04 +0200 Message-Id: <20210408175007.13360-30-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Spam-Scanner: SpamAssassin 3.003001 X-Spam-Score-relay: -1.9 X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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=1617904450; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=KB39wTovS1cKXYQx8pn1IiwD+Hs9nWvLDWQgDWAUv4U=; b=humGEeMhI/LixDt3e6Ql3+3gf0WkHDZ8kJ9CTOFPNQ9RzNEWgd7Y6FOWiQ34ssEoXPSf1G 747b/ZJHHIpDWcN9sYEgvCpuI2j/9GyFqPL8pDV3UYchwneyYyDcq3d0le4x/6NSDu5A13 tLN2yJx37MM7ldjYDs9xYzNuRxjJ8qY9Dxqxe3HLp7A08qmWJEm4r++o5J6meELWVEuEXA O8jYNnAkGUP2Xv7QnvmwaKGye3YqD7wQiFAlfSFzE4hY0bI3uJ5COQmiAjo54tfVflNhKf fjx+CJkDMry/sUkG3oTQNrcsu7OJMr2PXr9dMM/ZBHsG5V+LSHtfI4lBnFuKDw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1617904450; a=rsa-sha256; cv=none; b=EBXF85630DK2uugD1g0f8mV1kvSiA+ZTQO7bLT8hlC3d0/HKuc/N/yR+sRWX5jhzA/kLpx zGxQ3ku5/0TIA5sQAlr84PBr8iZd6MmYUN4MNETUIaQz6uvnidbgh1CWI1g+EN2eKH6lBN GTvB646GbMg7xcO3yE+3LzBMV4AdSB4PQBus1QSVCGb8GLmSE8smKgD7LmryjpdqN5Redq GIFkc8DLit6q01nn1yBR9/4Gbd9lPcD+kl3EP8bCkCAbxXL9vicfGtwkLx9uDMXzfBUX7X vrYsmiFXQBBlwI8/eB+vBIviZs8iKTIgtHY+Z5v93parQNb1FKvFQvpeHZc/Rg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=P+bhEYtp; 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.66 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=P+bhEYtp; dmarc=fail reason="SPF not aligned (relaxed)" header.from=student.tugraz.at (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: 29B33FA6C X-Spam-Score: 3.66 X-Migadu-Scanner: scn0.migadu.com X-TUID: dltvXnXj3xkP * gnu/packages/emacs-xyz.scm (emacs-w3m)[#:configure-flags]: Use elpa-directory to determine lispdir. [#:phases]: Likewise. --- gnu/packages/emacs-xyz.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 31312e9001..a7a1925c8e 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1696,14 +1696,16 @@ or unexpected behavior inside an elisp configuration file (typically ("imagemagick" ,imagemagick))) (arguments `(#:modules ((guix build gnu-build-system) + ((guix build emacs-build-system) #:prefix emacs:) (guix build utils) (guix build emacs-utils)) #:imported-modules (,@%gnu-build-system-modules + (guix build emacs-build-system) (guix build emacs-utils)) #:configure-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "--with-lispdir=" - out "/share/emacs/site-lisp") + (emacs:elpa-directory out)) (string-append "--with-icondir=" out "/share/images/emacs-w3m") ;; Leave .el files uncompressed, otherwise GC can't @@ -1748,8 +1750,7 @@ or unexpected behavior inside an elisp configuration file (typically (lambda* (#:key outputs #:allow-other-keys) (invoke "make" "install" "install-icons") (with-directory-excursion - (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp") + (emacs:elpa-directory (assoc-ref outputs "out")) (for-each delete-file '("ChangeLog" "ChangeLog.1")) (symlink "w3m-load.el" "w3m-autoloads.el") #t)))))) -- 2.31.1