From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH 4/4] gnu: Xfig: Set XAPPLOADDIR. Date: Fri, 25 Nov 2016 20:08:44 +0100 Message-ID: <1480100924-23868-4-git-send-email-jmd@gnu.org> References: <1480100924-23868-1-git-send-email-jmd@gnu.org> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:46243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cALrt-00052M-Es for guix-devel@gnu.org; Fri, 25 Nov 2016 14:09:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cALrq-00040a-Ah for guix-devel@gnu.org; Fri, 25 Nov 2016 14:09:05 -0500 In-Reply-To: <1480100924-23868-1-git-send-email-jmd@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org Cc: John Darrington * gnu/packages/xfig.scm (xfig) [arguments]: Remove wrapper. Set XAPPLOADDIR. --- gnu/packages/xfig.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm index 6436e52..6ad22b1 100644 --- a/gnu/packages/xfig.scm +++ b/gnu/packages/xfig.scm @@ -85,7 +85,10 @@ (string-append front out "/lib")) (("(XFIGDOCDIR = )[[:graph:]]*" _ front) (string-append front out "/share/doc")) - (("XCOMM USEINLINE") "USEINLINE")) + (("XCOMM USEINLINE") "USEINLINE") + (("XCOMM XAPPLOADDIR=") + (string-append "XAPPLOADDIR=" %output "lib"))) + ;; The -a argument is required in order to pick up the correct paths ;; to several X header files. (zero? (system* "xmkmf" "-a")) @@ -119,14 +122,7 @@ (close-pipe in) (close-port out))) (zero? (system* "make" "install.doc")))) - (alist-cons-after - 'install 'wrap-xfig - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/xfig") - `("XAPPLRESDIR" suffix - (,(string-append out "/etc/X11/app-defaults")))))) - %standard-phases)))))) + %standard-phases))))) (home-page "http://xfig.org/") (synopsis "Interactive drawing tool") (description -- 2.1.4