Patchwork [4/4] gnu: Xfig: Set XAPPLOADDIR.

login
register
mail settings
Submitter John Darrington
Date Nov. 25, 2016, 7:08 p.m.
Message ID <1480100924-23868-4-git-send-email-jmd@gnu.org>
Download mbox | patch
Permalink /patch/17898/
State New
Headers show

Comments

John Darrington - Nov. 25, 2016, 7:08 p.m.
* gnu/packages/xfig.scm (xfig) [arguments]: Remove wrapper.  Set XAPPLOADDIR.
---
 gnu/packages/xfig.scm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

Patch

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