From 282e8e28514e06ad003486dcd0de02dd67b3ee12 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Tue, 30 Apr 2024 17:27:17 +0200
Subject: [PATCH] zig: update package to 0.12

---
 ....patch => zig-0.12-use-LIBRARY_PATH.patch} |  0
 zilti/packages/zig.scm                        | 29 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)
 rename zilti/packages/patches/{zig-0.11-use-LIBRARY_PATH.patch => zig-0.12-use-LIBRARY_PATH.patch} (100%)

diff --git a/zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch b/zilti/packages/patches/zig-0.12-use-LIBRARY_PATH.patch
similarity index 100%
rename from zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch
rename to zilti/packages/patches/zig-0.12-use-LIBRARY_PATH.patch
diff --git a/zilti/packages/zig.scm b/zilti/packages/zig.scm
index 6386cc7..5a1c83b 100644
--- a/zilti/packages/zig.scm
+++ b/zilti/packages/zig.scm
@@ -19,6 +19,8 @@
   #:use-module
   (gnu packages compression)
   #:use-module
+  (gnu packages gcc)
+  #:use-module
   (gnu packages llvm)
   #:use-module
   (gnu packages llvm-meta)
@@ -26,11 +28,11 @@
   (gnu packages zig)
   )
 
-(define-public zig-0.11
+(define-public zig-0.12
   (package
     (inherit zig-0.10)
     (name "zig")
-    (version "0.11.0")
+    (version "0.12.0")
     (source
      (origin
        (method git-fetch)
@@ -39,22 +41,29 @@
              (commit version)))
        (file-name (git-file-name name version))
        (patches (search-patches
-                 "zilti/packages/patches/zig-0.11-use-LIBRARY_PATH.patch"))
+                 "zilti/packages/patches/zig-0.12-use-LIBRARY_PATH.patch"))
        (sha256
-        (base32 "0qh7c27cd4wcdjj0mbpkarvwypfk1js8hkyxs0z149qv75zkbrca"))))
+        (base32 "0jrj8rqp74qpb95zjmjyrai81079lcwaq1crdwd7laaskd8n5mj4"))))
     (arguments
      (substitute-keyword-arguments (package-arguments zig-0.10)
        ((#:parallel-build? _ #f) #t)
        ((#:configure-flags flags ''())
         #~(cons* (string-append "-DCMAKE_PREFIX_PATH="
-                                #$(file-append llvm-16 ""))
-                 #$flags))))
+                                #$(file-append llvm-17 ""))
+                 "-DCMAKE_SKIP_BUILD_RPATH=ON"
+                 "-DZIG_STATIC_LLVM=ON"
+                 (delete "-DZIG_SHARED_LLVM=ON"
+                       #$flags)))
+       ((#:phases phases '%standard-phases)
+        #~(modify-phases #$phases
+            (delete 'patch-more-shebangs)))))
     (inputs
      (modify-inputs (package-inputs zig-0.10)
-       (replace "clang" clang-16)
-       (replace "lld" lld-16)))
+       (replace "clang" clang-17)
+       (replace "lld" lld-17)))
     (native-inputs
      (modify-inputs (package-native-inputs zig-0.10)
-       (replace "llvm" llvm-16)))
+       (append gcc-13)
+       (replace "llvm" llvm-17)))
     (properties `((max-silent-time . 9600)
-                  ,@(clang-compiler-cpu-architectures "16")))))
+                  ,@(clang-compiler-cpu-architectures "17")))))