From patchwork Sat Feb 22 17:11:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 20369 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 97C8427BBE4; Sat, 22 Feb 2020 17:12:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 48EED17B5D for ; Sat, 22 Feb 2020 17:12:10 +0000 (GMT) Received: from localhost ([::1]:44550 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5YK1-000183-Lq for patchwork@mira.cbaines.net; Sat, 22 Feb 2020 12:12:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40382) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5YJv-00017d-Ph for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5YJu-00051F-F7 for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:43979) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5YJu-00051B-BU for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5YJu-000100-7o for guix-patches@gnu.org; Sat, 22 Feb 2020 12:12:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#39740] [PATCH 1/2] gnu: uim: Do not install elisp files in guix.d. References: <20200222170316.24016-1-arunisaac@systemreboot.net> In-Reply-To: <20200222170316.24016-1-arunisaac@systemreboot.net> Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 22 Feb 2020 17:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 39740 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 39740@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 39740-submit@debbugs.gnu.org id=B39740.15823915173823 (code B ref 39740); Sat, 22 Feb 2020 17:12:02 +0000 Received: (at 39740) by debbugs.gnu.org; 22 Feb 2020 17:11:57 +0000 Received: from localhost ([127.0.0.1]:49951 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJk-0000zQ-CR for submit@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:57 -0500 Received: from mugam.systemreboot.net ([139.59.75.54]:42822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1j5YJh-0000z6-Sr for 39740@debbugs.gnu.org; Sat, 22 Feb 2020 12:11:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Transfer-Encoding:Content-Type: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=M2uDiTq4fbaSpWyZgKDEKdGRO/9XbM6RMdj3qRHoHaM=; b=Q6G8iAK9DTPZp5KSt/U2y/w4PS MZPO+6tx2c1fpE2k94R2lm9+ou1YeRHHjNRYfQio/UCCPSBQEWVMZg0P3DHTqamkuCbhMUTLdCpih seeKivFSPzYtz0UFJpp4BXjqAK5jL0gZwJnv0DivNQgWXRrXqb2LkSEatKR+PmeL5z2w=; Received: from [192.168.2.1] (helo=localhost.localdomain) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1j5YJe-0013Md-5i; Sat, 22 Feb 2020 22:41:46 +0530 From: Arun Isaac Date: Sat, 22 Feb 2020 22:41:43 +0530 Message-Id: <20200222171144.24750-1-arunisaac@systemreboot.net> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 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 * gnu/packages/xorg.scm (uim)[arguments]: Pass %output/share/emacs to the --with-lispdir configure flag. Add fix-install-path phase after install phase. --- gnu/packages/xorg.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index f951e565ff..a7ba6fe9eb 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2016, 2017 John Darrington ;;; Copyright © 2017, 2018, 2019 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2020 Arun Isaac ;;; Copyright © 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2018 Kei Kebreau ;;; Copyright © 2018 Oleg Pykhalov @@ -6137,8 +6137,7 @@ X11 servers, Windows, or macOS.") (guix build emacs-utils)) #:configure-flags (list "--with-anthy-utf8" - (string-append "--with-lispdir=" %output - "/share/emacs/site-lisp/guix.d") + (string-append "--with-lispdir=" %output "/share/emacs") ;; Set proper runpath (string-append "LDFLAGS=-Wl,-rpath=" %output "/lib")) #:phases @@ -6151,8 +6150,17 @@ X11 servers, Windows, or macOS.") (string-append "\"" (assoc-ref outputs "out") "/bin/" executable "\""))) #t)) + ;; Fix installation path by renaming share/emacs/uim-el to + ;; share/emacs/site-lisp + (add-after 'install 'fix-install-path + (lambda* (#:key outputs #:allow-other-keys) + (let ((share-emacs (string-append (assoc-ref outputs "out") + "/share/emacs"))) + (rename-file (string-append share-emacs "/uim-el") + (string-append share-emacs "/site-lisp"))) + #t)) ;; Generate emacs autoloads for uim.el - (add-after 'install 'make-autoloads + (add-after 'fix-install-path 'make-autoloads (lambda* (#:key outputs #:allow-other-keys) (emacs-generate-autoloads ,name (string-append (assoc-ref outputs "out")