diff options
Diffstat (limited to 'vkraus/packages/disfluid.scm')
| -rw-r--r-- | vkraus/packages/disfluid.scm | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/vkraus/packages/disfluid.scm b/vkraus/packages/disfluid.scm index 48f303c..6b830e5 100644 --- a/vkraus/packages/disfluid.scm +++ b/vkraus/packages/disfluid.scm @@ -78,7 +78,7 @@ the-guile-exec "-c" "(display (effective-version))"))) - (guile-propagated-inputs + (all-inputs (remove-duplicates (cons out (map cdr inputs)))) @@ -88,26 +88,35 @@ (map (lambda (prop-input) (format #f "~a/share/guile/site/~a" prop-input effective-version)) - guile-propagated-inputs))) + all-inputs))) (go-paths (filter file-exists? (map (lambda (prop-input) (format #f "~a/lib/guile/~a/site-ccache" prop-input effective-version)) - guile-propagated-inputs)))) + all-inputs))) + (typelib-paths + (filter + file-exists? + (map (lambda (input) + (format #f "~a/lib/girepository-1.0" + input)) + all-inputs)))) (wrap-program (format #f "~a/bin/disfluid" out) `("GUILE_LOAD_PATH" ":" = ,mod-paths) - `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths)) + `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths) + `("GI_TYPELIB_PATH" ":" = ,typelib-paths)) (symlink (format #f "~a/bin/disfluid" out) (format #f "~a/bin/webid-oidc" out)) (for-each (lambda (program) (wrap-program - (format #f "~a/bin/disfluid-~a" out program) - `("GUILE_LOAD_PATH" ":" = ,mod-paths) - `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths))) + (format #f "~a/bin/disfluid-~a" out program) + `("GUILE_LOAD_PATH" ":" = ,mod-paths) + `("GUILE_LOAD_COMPILED_PATH" ":" = ,go-paths) + `("GI_TYPELIB_PATH" ":" = ,typelib-paths))) '(example-app hello)))))))) (native-inputs `(("pkg-config" ,pkg-config) @@ -126,7 +135,9 @@ ("help2man" ,help2man) ("which" ,which) ("glib" ,glib) - ("glib" ,glib "bin"))) + ("glib" ,glib "bin") + ("gtk+" ,gtk+) + ("libhandy" ,libhandy))) (inputs `(("guile" ,guile-3.0) ("guile-json" ,guile-json-4) ("guile-rdf" ,guile-rdf) @@ -285,6 +296,6 @@ corresponding source, as an AGPL requirement."))) `(,branch ,(file-append (disfluid-htmlize package) "/share/doc/disfluid/disfluid.html")))) branch-disfluids))))))))) (define-public disfluid-snapshot-explorer (disfluid-branch-snapshot #:branch-name "explorer" #:version "0.5.3-85-gee9c185" #:manual-mdate "2021-10-04T23:14:38+02:00" #:release-date "2021-10-10T12:43:28+02:00" #:commit-id "ee9c185154a724b12ad4a3b98d610b586aca1bd0" #:hash "039gg8jq9kb2f16q2l5wyanxm972j7qirr8isw2v4w2rj29h8390")) -(define-public disfluid (disfluid-release #:version "0.5.3-82-gabd3891" #:manual-mdate "2021-10-04T23:14:38+02:00" #:release-date "2021-10-08T16:07:28+02:00" #:commit-id "abd3891ecf852d242b1986218a6cc3b8613daef0" #:hash "0bs6pbgk7ylbk3rgnvx6jdsflcljqwx37irnm99k71cvh2fq5i9a")) -(define-public disfluid-snapshot-master (disfluid-branch-snapshot #:branch-name "master" #:version "0.5.3-82-gabd3891" #:manual-mdate "2021-10-04T23:14:38+02:00" #:release-date "2021-10-08T16:07:28+02:00" #:commit-id "abd3891ecf852d242b1986218a6cc3b8613daef0" #:hash "0bs6pbgk7ylbk3rgnvx6jdsflcljqwx37irnm99k71cvh2fq5i9a")) +(define-public disfluid (disfluid-release #:version "0.5.3-83-g00071bb" #:manual-mdate "2021-10-04T23:14:38+02:00" #:release-date "2021-10-10T12:48:24+02:00" #:commit-id "00071bbfc0e79970a70ef80e6e711a1700b1c773" #:hash "1asay247148pifxn3zqcdljyq38q07l2x77kjgcahl0k0588h4kh")) +(define-public disfluid-snapshot-master (disfluid-branch-snapshot #:branch-name "master" #:version "0.5.3-83-g00071bb" #:manual-mdate "2021-10-04T23:14:38+02:00" #:release-date "2021-10-10T12:48:24+02:00" #:commit-id "00071bbfc0e79970a70ef80e6e711a1700b1c773" #:hash "1asay247148pifxn3zqcdljyq38q07l2x77kjgcahl0k0588h4kh")) (define-public disfluid:website (make-website disfluid (list (cons "explorer" disfluid-snapshot-explorer) (cons "master" disfluid-snapshot-master)))) |