hako pushed a commit to branch wip-zig-bootstrap
in repository guix.

commit 52d87cf45d015b966214806f49cb45d37b3853cc
Author: Hilton Chain <[email protected]>
AuthorDate: Mon Nov 11 21:42:25 2024 +0800

    fixup! gnu: Add zig-0.12.
    
    Change-Id: Ia650de65245b0c2e9e3a3ec6a00cd244256d3394
---
 gnu/packages/zig.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm
index b5d1387518..3810d13cb1 100644
--- a/gnu/packages/zig.scm
+++ b/gnu/packages/zig.scm
@@ -1776,7 +1776,6 @@ toolchain.  Among other features it provides
        (modify-inputs (package-native-inputs base)
          (replace "zig" `(,base "out")))))))
 
-;; FIXME: RUNPATH.
 (define-public zig-0.12
   (package
     (inherit zig-0.11)
@@ -1791,7 +1790,17 @@ toolchain.  Among other features it provides
               (sha256
                (base32
                 "0ssgfrsk116p16rwjwq1z2pvvcdij6s30s19bhzjms7maz4s77hb"))
-              (snippet '(delete-file "stage1/zig1.wasm"))))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  (delete-file "stage1/zig1.wasm")
+                  ;; Fix RUNPATH.
+                  (substitute* "build.zig"
+                    (("path_unpadded }\\);" all)
+                     (string-append all "
+    exe.addRPath(.{
+        .cwd_relative = path_unpadded[0 .. path_unpadded.len - 1 - objname.len]
+    });")))))))
     (arguments
      (substitute-keyword-arguments (package-arguments zig-0.11)
        ((#:phases phases '%standard-phases)

Reply via email to