From: John Darrington <jmd@gnu.org>
To: guix-devel@gnu.org
Cc: John Darrington <jmd@gnu.org>
Subject: [PATCH 4/4] gnu: Xfig: Set XAPPLOADDIR.
Date: Fri, 25 Nov 2016 20:08:44 +0100 [thread overview]
Message-ID: <1480100924-23868-4-git-send-email-jmd@gnu.org> (raw)
In-Reply-To: <1480100924-23868-1-git-send-email-jmd@gnu.org>
* 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
next prev parent reply other threads:[~2016-11-25 19:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-25 19:08 [PATCH 1/4] gnu: Add XFILESEARCH path to profiles' environment John Darrington
2016-11-25 19:08 ` [PATCH 2/4] gnu: Add editres John Darrington
2016-11-27 21:22 ` Ludovic Courtès
2016-11-25 19:08 ` [PATCH 3/4] gnu: Remove wrappers from xfd and xfontsel John Darrington
2016-11-25 19:08 ` John Darrington [this message]
2016-11-27 21:22 ` [PATCH 1/4] gnu: Add XFILESEARCH path to profiles' environment Ludovic Courtès
2016-11-28 13:19 ` John Darrington
2016-11-29 14:34 ` Ludovic Courtès
2016-11-29 18:16 ` John Darrington
2016-11-29 21:42 ` Ludovic Courtès
2016-11-30 5:36 ` John Darrington
2016-12-02 16:25 ` [PATCH] gnu: Patch libxt's default search path John Darrington
2016-12-04 21:19 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1480100924-23868-4-git-send-email-jmd@gnu.org \
--to=jmd@gnu.org \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).