This is an automated email from the git hooks/post-receive script.

guix_mirror_bot pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 18f545c14eb gnu: guile-osc: Call ‘target-guile-effective-version’ on 
the build side.
18f545c14eb is described below

commit 18f545c14eb36c7c588d2cf356e387e17e53cd51
Author: Ludovic Courtès <[email protected]>
AuthorDate: Mon Nov 9 14:12:58 2026 +0100

    gnu: guile-osc: Call ‘target-guile-effective-version’ on the build side.
    
    Fixes a bug introduced in c37b551bed24aa9fe68017dd2f25a0df0b9dc89d whereby 
the
    ‘guile-osc-lib’ package would call ‘target-guile-effective-version’ on the
    host side instead of calling it on the build side.
    
    As a result, this would invoke ‘guile‘ from $PATH any time ‘guile-osc-lib’ 
is
    lowered to a derivation, and the resulting derivation would depend on 
whether
    ‘guile’ is found and on what ‘target-guile-effective-version’ returns.
    
    * gnu/packages/guile-xyz.scm (guile-osc-lib)[arguments]: Set #:modules.
    In #:phases, wrap in ‘with-imported-modules’; call
    ‘target-guile-effective-version’ on the build side.
    
    Fixes: guix/guix#12411
    Reported-by: Jelle Licht <[email protected]>
    Signed-off-by: Gabriel Wicki <[email protected]>
---
 gnu/packages/guile-xyz.scm | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 1d24774bfe7..a19c3e55bbc 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -6532,24 +6532,28 @@ text-oriented consoles with keyboard and mouse input.")
     (build-system meson-build-system)
     (arguments
      (list
+      #:modules `(((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
+                  (guix build meson-build-system)
+                  (guix build utils))
       #:phases
-      #~(modify-phases %standard-phases
-          (add-before 'configure 'omit-building-go
-            (lambda _
-              (substitute* "../source/meson.build"
-                (("foreach file : scm_files")  ; Do not compile scheme files.
-                 "foreach file : []")
-                (("guile_sitedir = .*")
-                 (format #f "guile_sitedir = '~a/share/guile/site/~a/'\n"
-                         #$output
-                         #$((@ (guix build guile-build-system)
-                               target-guile-effective-version))))
-                (("guile_extdir = .*")
-                 (format #f "guile_extdir = '~a/lib/guile/~a/extensions'"
-                         #$output
-                         #$((@ (guix build guile-build-system)
-                               target-guile-effective-version)))))))
-          (delete 'shrink-runpath))))
+      (with-imported-modules '((guix build guile-build-system))
+        #~(modify-phases %standard-phases
+            (add-before 'configure 'omit-building-go
+              (lambda _
+                (substitute* "../source/meson.build"
+                  (("foreach file : scm_files")  ; Do not compile scheme files.
+                   "foreach file : []")
+                  (("guile_sitedir = .*")
+                   (format #f "guile_sitedir = '~a/share/guile/site/~a/'\n"
+                           #$output
+                           #$((@ (guix build guile-build-system)
+                                 target-guile-effective-version))))
+                  (("guile_extdir = .*")
+                   (format #f "guile_extdir = '~a/lib/guile/~a/extensions'"
+                           #$output
+                           (target-guile-effective-version))))))
+            (delete 'shrink-runpath)))))
     (native-inputs (list pkg-config cmake))
     (inputs (list guile-3.0-latest liblo))
     (home-page "https://github.com/taw10/guile-osc";)

Reply via email to