From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UN+VF5kfe2AQPgEAgWs5BA (envelope-from ) for ; Sat, 17 Apr 2021 19:49:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cJFWEZkfe2BydAAA1q6Kng (envelope-from ) for ; Sat, 17 Apr 2021 17:49:13 +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 159E717E5F for ; Sat, 17 Apr 2021 19:49:13 +0200 (CEST) Received: from localhost ([::1]:32818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lXoUR-0003YG-Hd for larch@yhetil.org; Sat, 17 Apr 2021 13:12:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33808) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lXoQg-00006D-3N for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:22 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32861) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lXoQd-0000Nj-RM for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:19 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lXoQb-0005fY-MC for guix-patches@gnu.org; Sat, 17 Apr 2021 13:08:17 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH v2 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: Sat, 17 Apr 2021 17:08:17 +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.161867929121676 (code B ref 47661); Sat, 17 Apr 2021 17:08:17 +0000 Received: (at 47661) by debbugs.gnu.org; 17 Apr 2021 17:08:11 +0000 Received: from localhost ([127.0.0.1]:44386 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQU-0005dK-C3 for submit@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:10 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:57274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lXoQQ-0005bn-Ci for 47661@debbugs.gnu.org; Sat, 17 Apr 2021 13:08:07 -0400 Received: from localhost.localdomain (194-96-9-9.adsl.highway.telekom.at [194.96.9.9]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FMzzm1L1Rz1LB1y for <47661@debbugs.gnu.org>; Sat, 17 Apr 2021 19:08:04 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FMzzm1L1Rz1LB1y DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1618679284; bh=hF3nvnkG8M+/Kv0lDrMaCP1XusduTmPyumX681h1G38=; h=From:To:Subject:Date:In-Reply-To:References:From; b=D9zc2ZEopBR2DWoRE712NVKdy77erSJyPoquTwaIc7XW4NdaesjUoDOzDpGYGv2cH zvHy7nYqfiOOSuA9+Ldbq4wCTCu7JIxFKJV4NuVSZVn7c4vPcPXSu2XdfM5aBnyDjp hnrvIu2Pf+TSWQEiIJWNx8xUpVbHA6WRlbKC19jU= From: Leo Prikler Date: Sat, 17 Apr 2021 19:06:45 +0200 Message-Id: <20210417170648.3810-30-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210417170648.3810-1-leo.prikler@student.tugraz.at> References: <20210417170648.3810-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=1618681753; 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=hF3nvnkG8M+/Kv0lDrMaCP1XusduTmPyumX681h1G38=; b=jKugEHqxzNjQGuhs3GQL1p4gLOorKQXXCMU24zBmfdGD/yH3lqunlrPGwQzOBZU8du73Lw wQjCkLI2tmDlZWT+vQs1il2V+uu7LsTUPkDRklSoVqkRnfEYcNMw3rzwwS+voE39xtmlIX rF5PhKRX3ntKG5jvsscwYssGwcTisnzJjf1BvvUt6eXOxHaeV66VWpaJXpTr28fhSups8Y xQwdyurlgSkkYQe9EjknOTqXpAgYlHn/TetsGMhF85m4R68QUuZC9KKKtUdzdN+/yXSD1y YCMFikDDbckHn80bIosHtExR66tcIjWscKvWw/oVO/sl3lhlqzii991xeaYoMg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1618681753; a=rsa-sha256; cv=none; b=u8mYkkybQgagTBMdfZ16av6WQqHEjfOEmuydM1dZhAmZrPX0+jp++0EY01kE25I1+8O6zp 32gvstS5ckSdITWAOSDZZOexSXo11caAT6XoGd0/HOvKVJ1xLb8G1DfLIVt1n3fwMAtEe6 FVBsNnG+2MP7BAxzkz6AAY+4JjvGP8e94BPXmW3nR/Btrij7+yDTwKyGF2efehUrP24gcs tFODapcZJwRIEj8VqZI2H9On1HAFeYt8dq9LOPdua1pEz7TNmpVrtN+rfd3q4/gNlM/yC5 DfJoAxZomDWUiGYqe6QLacCga1C6StkYlpOLVx6C/gu8ffuOmO1Hgk5wvIQzdQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=D9zc2ZEo; 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: 5.16 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tugraz.at header.s=mailrelay header.b=D9zc2ZEo; 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: 159E717E5F X-Spam-Score: 5.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: 5dho5R0xgw0m * 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 ee3df7cf19..949659e617 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1721,14 +1721,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 @@ -1773,8 +1775,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