nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
John Darrington 2017-01-12 10:19:12 +01:00
parent 0eefac0f2f
commit 97fedab17d
No known key found for this signature in database
GPG Key ID: 8A67719C2DE827B3
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/xfig.scm
View File

@ -65,6 +65,8 @@
(let ((imake (assoc-ref inputs "imake")) (let ((imake (assoc-ref inputs "imake"))
(out (assoc-ref outputs "out"))) (out (assoc-ref outputs "out")))
(substitute* "Imakefile" (substitute* "Imakefile"
(("XCOMM XAPPLOADDIR = /home/user/xfig *")
(string-append "XAPPLOADDIR = " out %app-defaults-dir))
(("XCOMM (BINDIR = )[[:graph:]]*" _ front) (("XCOMM (BINDIR = )[[:graph:]]*" _ front)
(string-append front out "/bin")) (string-append front out "/bin"))
(("(PNGLIBDIR = )[[:graph:]]*" _ front) (("(PNGLIBDIR = )[[:graph:]]*" _ front)
@ -98,7 +100,8 @@
(("(MANPATH = )[[:graph:]]*" _ front) (("(MANPATH = )[[:graph:]]*" _ front)
(string-append front out "/share/man")) (string-append front out "/share/man"))
(("(CONFDIR = )([[:graph:]]*)" _ front default) (("(CONFDIR = )([[:graph:]]*)" _ front default)
(string-append front out default)))))) (string-append front out default))))
#t))
(add-after (add-after
'install 'install/libs 'install 'install/libs
(lambda _ (lambda _
@ -118,14 +121,7 @@
(dump-port in out) (dump-port in out)
(close-pipe in) (close-pipe in)
(close-port out))) (close-port out)))
(zero? (system* "make" "install.doc"))))) (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"))))))))))
(home-page "http://xfig.org/") (home-page "http://xfig.org/")
(synopsis "Interactive drawing tool") (synopsis "Interactive drawing tool")
(description (description

2
gnu/packages/xorg.scm
View File

@ -335,7 +335,7 @@ provided.")
(license (license:x11-style "file://dri3proto.h" (license (license:x11-style "file://dri3proto.h"
"See 'dri3proto.h' in the distribution.")))) "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 (define-public editres
(package (package