[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#41389] [PATCH 1/2] gnu: guile-dsv: Wrap script.
From: |
Jack Hill |
Subject: |
[bug#41389] [PATCH 1/2] gnu: guile-dsv: Wrap script. |
Date: |
Sat, 23 May 2020 18:50:38 -0400 |
* gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program"
phase. Import target-guile-effective-version from guile-build-system for use
in new phase.
---
gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a1deee32d1..b1c1fd0f62 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -25,6 +25,7 @@
;;; Copyright © 2019 Timothy Sample <address@hidden>
;;; Copyright © 2019, 2020 Martin Becze <address@hidden>
;;; Copyright © 2020 Evan Straw <address@hidden>
+;;; Copyright © 2020 Jack Hill <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -467,7 +468,12 @@ you send to a FIFO file.")
(inputs `(("guile" ,guile-2.2)))
(propagated-inputs `(("guile2.2-lib" ,guile2.2-lib)))
(arguments
- '(#:phases (modify-phases %standard-phases
+ `(#:modules (((guix build guile-build-system)
+ #:select (target-guile-effective-version))
+ ,@%gnu-build-system-modules)
+ #:imported-modules ((guix build guile-build-system)
+ ,@%gnu-build-system-modules)
+ #:phases (modify-phases %standard-phases
(add-before 'configure 'set-guilesitedir
(lambda _
(substitute* "Makefile.in"
@@ -482,6 +488,24 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
(("^guilesitedir =.*$")
"guilesitedir = \
$(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+ #t))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let* ((out (assoc-ref outputs "out"))
+ (bin (string-append out "/bin"))
+ (guile-lib (assoc-ref inputs "guile2.2-lib"))
+ (version (target-guile-effective-version))
+ (scm (string-append "/share/guile/site/"
+ version))
+ (go (string-append "/lib/guile/"
+ version "/site-ccache")))
+ (wrap-program (string-append bin "/dsv")
+ `("GUILE_LOAD_PATH" prefix
+ (,(string-append out scm)
+ ,(string-append guile-lib scm)))
+ `("GUILE_LOAD_COMPILED_PATH" prefix
+ (,(string-append out go)
+ ,(string-append guile-lib go)))))
#t)))))
(home-page "https://github.com/artyom-poptsov/guile-dsv")
(synopsis "DSV module for Guile")
--
2.26.2
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Jack Hill, 2020/05/19
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Ludovic Courtès, 2020/05/23
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Jack Hill, 2020/05/23
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Ludovic Courtès, 2020/05/24
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Jack Hill, 2020/05/24
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Ludovic Courtès, 2020/05/25
- [bug#41389] [PATCH] gnu: guile-dsv: Wrap script., Jack Hill, 2020/05/25