guix_mirror_bot pushed a commit to branch master
in repository guix.
commit d62e0e0c123a6b37f06ab3cb180da0e9d69e7549
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Nov 16 11:14:17 2026 +0100
gnu: guile-osc: Remove all host-side uses of
‘target-guile-effective-version’.
This is a followup to the incomplete fix in
18f545c14eb36c7c588d2cf356e387e17e53cd51.
* gnu/packages/guile-xyz.scm (guile-osc-lib)[arguments]: Remove other
occurrence of ‘target-guile-effective-version’.
(guile-osc)[arguments]: Likewise.
Signed-off-by: Ludovic Courtès <[email protected]>
Merges: #12590
---
gnu/packages/guile-xyz.scm | 65 ++++++++++++++++++++++------------------------
1 file changed, 31 insertions(+), 34 deletions(-)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 24b6b6e3d3a..cf3794ccbfe 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -6587,8 +6587,7 @@ text-oriented consoles with keyboard and mouse input.")
(("guile_sitedir = .*")
(format #f "guile_sitedir = '~a/share/guile/site/~a/'\n"
#$output
- #$((@ (guix build guile-build-system)
- target-guile-effective-version))))
+ (target-guile-effective-version)))
(("guile_extdir = .*")
(format #f "guile_extdir = '~a/lib/guile/~a/extensions'"
#$output
@@ -6607,38 +6606,36 @@ client and server API of the @acronym{OSC, Open Sound
Control} format.")
(inherit guile-osc-lib)
(name "guile-osc")
(arguments
- (list
- #:phases
- #~(modify-phases %standard-phases
- (add-before 'configure 'fix-build-recipe
- (lambda _
- (substitute* "meson.build"
- (("depends: .*") ""))))
- (add-before 'build 'patch-install-paths
- (lambda _
- (substitute* "../source/open-sound-control/api.scm"
- (("\\(load-extension.*")
- (format #f
- "(load-extension
\"~a/lib/guile/~a/extensions/libguile-osc.so\"\n"
- #$(this-package-input "guile-osc-lib")
- #$((@ (guix build guile-build-system)
- target-guile-effective-version)))))))
- (add-before 'check 'set-sitedir
- (lambda _
- (substitute* "../source/meson.build"
- (("guile_sitedir = .*")
- (format #f "guile_sitedir = '~a/share/guile/site/~a/'\n"
- #$output
- #$((@ (guix build guile-build-system)
- target-guile-effective-version))))
- (("guile_cachedir = .*")
- (format #f "guile_cachedir = '~a/lib/guile/~a/site-ccache'\n"
- #$output
- #$((@ (guix build guile-build-system)
- target-guile-effective-version))))
- (("guile_extdir = .*")
- (format #f "guile_extdir = '~a/lib/'" #$output)))))
- (delete 'shrink-runpath))))
+ (substitute-keyword-arguments arguments
+ ((#:phases phases #~%standard-phases)
+ (with-imported-modules '((guix build guile-build-system))
+ #~(modify-phases %standard-phases ;ignore parent phases
+ (add-before 'configure 'fix-build-recipe
+ (lambda _
+ (substitute* "meson.build"
+ (("depends: .*") ""))))
+ (add-before 'build 'patch-install-paths
+ (lambda _
+ (substitute* "../source/open-sound-control/api.scm"
+ (("\\(load-extension.*")
+ (format #f
+ "(load-extension
\"~a/lib/guile/~a/extensions/libguile-osc.so\"\n"
+ #$(this-package-input "guile-osc-lib")
+ (target-guile-effective-version))))))
+ (add-before 'check 'set-sitedir
+ (lambda _
+ (substitute* "../source/meson.build"
+ (("guile_sitedir = .*")
+ (format #f "guile_sitedir = '~a/share/guile/site/~a/'\n"
+ #$output
+ (target-guile-effective-version)))
+ (("guile_cachedir = .*")
+ (format #f "guile_cachedir =
'~a/lib/guile/~a/site-ccache'\n"
+ #$output
+ (target-guile-effective-version)))
+ (("guile_extdir = .*")
+ (format #f "guile_extdir = '~a/lib/'" #$output)))))
+ (delete 'shrink-runpath))))))
(inputs (list guile-3.0-latest guile-osc-lib liblo))
(home-page "https://github.com/taw10/guile-osc")
(synopsis "OSC API Implementation")