[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/10: gnu: guile-dsv: Wrap script.
From: |
guix-commits |
Subject: |
02/10: gnu: guile-dsv: Wrap script. |
Date: |
Sun, 24 May 2020 18:00:51 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit b7e1e556b2d0dd6685f41abcf92bb7f0b28f72e9
Author: Jack Hill <address@hidden>
AuthorDate: Sat May 23 18:50:38 2020 -0400
gnu: guile-dsv: Wrap script.
* 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.
Signed-off-by: Ludovic Courtès <address@hidden>
---
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 a1deee3..b1c1fd0 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")
- branch master updated (9b572ab -> 9744cc7), guix-commits, 2020/05/24
- 03/10: gnu: guile-dsv: Build with Guile 3.0., guix-commits, 2020/05/24
- 02/10: gnu: guile-dsv: Wrap script.,
guix-commits <=
- 05/10: gnu: protonvpn-cli: Tweak description., guix-commits, 2020/05/24
- 04/10: gnu: Add protonvpn-cli., guix-commits, 2020/05/24
- 07/10: channels: 'latest-channel-instances' doesn't leak internal state., guix-commits, 2020/05/24
- 01/10: doc: cookbook: Add subsection about session locking with xss-lock., guix-commits, 2020/05/24
- 08/10: git: 'update-cached-checkout' returns the commit relation., guix-commits, 2020/05/24
- 10/10: pull: Protect against downgrade attacks., guix-commits, 2020/05/24
- 09/10: channels: 'latest-channel-instances' guards against non-forward updates., guix-commits, 2020/05/24
- 06/10: git: Add 'commit-relation'., guix-commits, 2020/05/24