me
/
guix
Archived
1
0
Fork 0
Code

gnu: guile-charting: Modules correctly installed, guile-cairo propagated. 

* gnu/packages/guile.scm (guile-charting): Patch Makefile.in files to
  install to guile/site/2.0.  Move GUILE-CAIRO to 'propagated-inputs'.
master
Ludovic Courtès 2014-09-16 17:49:57 +02:00
parent 3f9d63df13
commit 64a4a21e86
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gnu/packages/guile.scm
View File

@ -373,17 +373,24 @@ http:://json.org specification. These are the main features:
"1l8xcqq4cp67jzxnmf07ivsgq23mfmi00zz1s8bnv2zkb0ab9475")) "1l8xcqq4cp67jzxnmf07ivsgq23mfmi00zz1s8bnv2zkb0ab9475"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Remove dependency from guile-charting.texi to '(begin
;; guile-chartingscmfiles to avoid rebuild the doc (which is ;; Use the standard versioned location for modules.
;; unnecessary and fails with "failed to match any pattern in (substitute* '("Makefile.in" "charting/Makefile.in")
;; form define-macro-with-docs" as of Guile 2.0.11.) (("/share/guile/site")
'(substitute* "doc/Makefile.in" "/share/guile/site/2.0"))
(("^(.+):(.*) \\$\\(doc\\)scmfiles(.*$)" _ target dep1 dep2)
(string-append target ":" dep1 " " dep2 "\n")))))) ;; Remove dependency from guile-charting.texi to
;; guile-chartingscmfiles to avoid rebuild the doc (which is
;; unnecessary and fails with "failed to match any pattern
;; in form define-macro-with-docs" as of Guile 2.0.11.)
(substitute* "doc/Makefile.in"
(("^(.+):(.*) \\$\\(doc\\)scmfiles(.*$)" _ target
dep1 dep2)
(string-append target ":" dep1 " " dep2 "\n")))))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.0)))
("guile-cairo" ,guile-cairo))) (propagated-inputs `(("guile-cairo" ,guile-cairo)))
(home-page "http://wingolog.org/software/guile-charting/") (home-page "http://wingolog.org/software/guile-charting/")
(synopsis "Create charts and graphs in Guile") (synopsis "Create charts and graphs in Guile")
(description (description