summaryrefslogtreecommitdiff
path: root/gnu/packages/xfig.scm
diff options
context:
space:
mode:
authorJohn Darrington <jmd@gnu.org>2017-01-12 10:19:12 +0100
committerJohn Darrington <jmd@gnu.org>2017-01-12 17:41:06 +0100
commit97fedab17d4acfa05969ddd9faf98a11d27a4743 (patch)
tree2a5df13f6911dabd06d51438a936f4a1862d1640 /gnu/packages/xfig.scm
parent0eefac0f2f2c7b57471d352abfad7fa306a69df2 (diff)
downloadpatches-97fedab17d4acfa05969ddd9faf98a11d27a4743.tar
patches-97fedab17d4acfa05969ddd9faf98a11d27a4743.tar.gz
gnu: xfig: Remove wrapper and clean up implementation.
* gnu/packages/xorg.scm (%app-defaults-dir): Make public. * gnu/packages/xfig.scm (xfig)[attributes]: Remove wrapper and set the XAPPLOADDIR in the Imakefile instead.
Diffstat (limited to 'gnu/packages/xfig.scm')
-rw-r--r--gnu/packages/xfig.scm14
1 files changed, 5 insertions, 9 deletions
diff --git a/gnu/packages/xfig.scm b/gnu/packages/xfig.scm
index 27d9cf9ab3..ad1b432abd 100644
--- a/gnu/packages/xfig.scm
+++ b/gnu/packages/xfig.scm
@@ -65,6 +65,8 @@
(let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out")))
(substitute* "Imakefile"
+ (("XCOMM XAPPLOADDIR = /home/user/xfig *")
+ (string-append "XAPPLOADDIR = " out %app-defaults-dir))
(("XCOMM (BINDIR = )[[:graph:]]*" _ front)
(string-append front out "/bin"))
(("(PNGLIBDIR = )[[:graph:]]*" _ front)
@@ -98,7 +100,8 @@
(("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default)
- (string-append front out default))))))
+ (string-append front out default))))
+ #t))
(add-after
'install 'install/libs
(lambda _
@@ -118,14 +121,7 @@
(dump-port in out)
(close-pipe in)
(close-port out)))
- (zero? (system* "make" "install.doc")))))
- (add-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"))))))))))
+ (zero? (system* "make" "install.doc"))))))))
(home-page "http://xfig.org/")
(synopsis "Interactive drawing tool")
(description