diff options
| author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-10 12:48:24 +0200 |
|---|---|---|
| committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-10 12:48:24 +0200 |
| commit | 00071bbfc0e79970a70ef80e6e711a1700b1c773 (patch) | |
| tree | c397fb44281cabeb1fb126adb24d3e90e3c3d9f1 | |
| parent | abd3891ecf852d242b1986218a6cc3b8613daef0 (diff) | |
guix: fix typelib path in installed program
| -rw-r--r-- | guix/vkraus/packages/disfluid.scm | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/guix/vkraus/packages/disfluid.scm b/guix/vkraus/packages/disfluid.scm index 896bd8a..c2c2c4c 100644 --- a/guix/vkraus/packages/disfluid.scm +++ b/guix/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) |