diff options
| author | John Darrington <jmd@gnu.org> | 2017-01-12 10:19:12 +0100 |
|---|---|---|
| committer | John Darrington <jmd@gnu.org> | 2017-01-12 17:41:06 +0100 |
| commit | 97fedab17d4acfa05969ddd9faf98a11d27a4743 (patch) | |
| tree | 2a5df13f6911dabd06d51438a936f4a1862d1640 | |
| parent | 0eefac0f2f2c7b57471d352abfad7fa306a69df2 (diff) | |
| download | patches-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.
| -rw-r--r-- | gnu/packages/xfig.scm | 14 | ||||
| -rw-r--r-- | gnu/packages/xorg.scm | 2 |
2 files changed, 6 insertions, 10 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 diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 45ff4c97ea..fe607e2632 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -335,7 +335,7 @@ provided.") (license (license:x11-style "file://dri3proto.h" "See 'dri3proto.h' in the distribution.")))) -(define %app-defaults-dir "/lib/X11/app-defaults") +(define-public %app-defaults-dir "/lib/X11/app-defaults") (define-public editres (package |