diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/zig.scm | |
parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/zig.scm')
-rw-r--r-- | gnu/packages/zig.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/zig.scm b/gnu/packages/zig.scm index 4c048ef580..9e99fdb857 100644 --- a/gnu/packages/zig.scm +++ b/gnu/packages/zig.scm @@ -39,14 +39,11 @@ (file-name (git-file-name name version)) (sha256 (base32 "0nfvgg23sw50ksy0z0ml6lkdsvmd0278mq29m23dbb2jsirkhry7")) - (patches - (search-patches - "zig-disable-libc-note-test.patch" - "zig-use-system-paths.patch")))) + (patches (search-patches "zig-use-system-paths.patch")))) (build-system cmake-build-system) (inputs (list clang-13 ; Clang propagates llvm. - lld)) + lld-13)) ;; Zig compiles fine with GCC, but also needs native LLVM libraries. (native-inputs (list llvm-13)) |