diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2019-01-31 16:21:43 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-31 16:26:22 +0100 |
| commit | 395a95bb7552ccb547cd4f3de4123b124632cf6e (patch) | |
| tree | 6409a859e296b8a80524f0871672c3ce86cda492 | |
| parent | adba64662cb9db3c587e4b146ff31a1dbbc9f265 (diff) | |
gnu: guile-hall: Wrap with guile-config.
* gnu/packages/guile-xyz.scm (guile-hall)[arguments]: Extend
"hall-wrap-binaries" phase to include guile-config in the load path.
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 49 |
1 files changed, 22 insertions, 27 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index f5f7783e23..5c6a6c7e0b 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -1159,34 +1159,30 @@ above command-line parameters.") (ice-9 ftw) ,@%gnu-build-system-modules) #:phases - (modify-phases - %standard-phases - (add-after - 'install - 'hall-wrap-binaries - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin/")) - (site (string-append out "/share/guile/site"))) + (modify-phases %standard-phases + (add-after 'install 'hall-wrap-binaries + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin/")) + (site (string-append out "/share/guile/site")) + (config (assoc-ref inputs "guile-config"))) (match (scandir site) (("." ".." version) (let ((modules (string-append site "/" version)) - (compiled-modules - (string-append - out - "/lib/guile/" - version - "/site-ccache"))) - (for-each - (lambda (file) - (wrap-program - (string-append bin file) - `("GUILE_LOAD_PATH" ":" prefix (,modules)) - `("GUILE_LOAD_COMPILED_PATH" - ":" - prefix - (,compiled-modules)))) - ,(list 'list "hall")) + (compiled-modules (string-append + out "/lib/guile/" version + "/site-ccache"))) + (wrap-program (string-append bin "hall") + `("GUILE_LOAD_PATH" ":" prefix + (,modules + ,(string-append config + "/share/guile/site/" + version))) + `("GUILE_LOAD_COMPILED_PATH" ":" prefix + (,compiled-modules + ,(string-append config "/lib/guile/" + version + "/site-ccache")))) #t))))))))) (native-inputs `(("autoconf" ,autoconf) @@ -1202,8 +1198,7 @@ above command-line parameters.") allow you to quickly create and publish Guile projects. It allows you to transparently support the GNU build system, manage a project hierarchy & provides tight coupling to Guix.") - (home-page - "https://gitlab.com/a-sassmannshausen/guile-hall") + (home-page "https://gitlab.com/a-sassmannshausen/guile-hall") (license license:gpl3+))) (define-public guile-ics |