From 080579a0884a6510f210e700dfd24af32f861b3b Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Tue, 4 Jul 2023 03:12:27 +0300 Subject: Use build.zig.zon for fetching curl --- build.zig | 3 ++- build.zig.zon | 4 ++++ libs/curl | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) delete mode 160000 libs/curl diff --git a/build.zig b/build.zig index bc3f145..94cccf9 100644 --- a/build.zig +++ b/build.zig @@ -14,6 +14,7 @@ pub fn build(b: *Build) void { config.addOption(SemanticVersion, "version", version); const clap = b.dependency("clap", .{}); + const curl = b.dependency("curl", .{}); const exe = b.addExecutable(.{ .name = "zup", @@ -24,7 +25,7 @@ pub fn build(b: *Build) void { }); exe.addOptions("zup-config", config); exe.addModule("clap", clap.module("clap")); - exe.addModule("curl", b.createModule(.{ .source_file = .{ .path = "libs/curl/curl.zig" } })); + exe.addModule("curl", curl.module("curl")); exe.addModule("libarchive", b.createModule(.{ .source_file = .{ .path = "libs/libarchive/libarchive.zig" }, })); diff --git a/build.zig.zon b/build.zig.zon index 575adcc..276ecef 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -7,5 +7,9 @@ .url = "https://github.com/Hejsil/zig-clap/archive/bdb5853b678d68f342ec65b04a6785af522ca6c9.tar.gz", .hash = "12202af04ec78191f2018458a7be29f54e0d9118f7688e7a226857acf754d68b8473", }, + .curl = .{ + .url = "https://git.sr.ht/~ukko/zig-curl/archive/aa55a3d061fceebf737c0af25a6df2d05f83bcad.tar.gz", + .hash = "12208fc84cbd67383b6fe7e3f65a965cead4577ca27cd59660a2812c9f4edc545c5e", + }, }, } diff --git a/libs/curl b/libs/curl deleted file mode 160000 index f6915b7..0000000 --- a/libs/curl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f6915b7da30b39ced132c4f163ce7f2ec451065e -- cgit v1.2.3