diff --git a/nix/sources-mingw.json b/nix/sources-mingw.json index 53dcecb3c..59e74f2c9 100644 --- a/nix/sources-mingw.json +++ b/nix/sources-mingw.json @@ -1,4 +1,21 @@ { + "curl": { + "branch": "master", + "description": "A command line tool and library for transferring data with URL syntax", + "homepage": "http://curl.se/", + "mingw": { + "include": "include", + "lib": "lib/.libs", + "prepare": "autoreconf -vfi && ./configure --disable-shared --disable-ldap --disable-rtsp --without-brotli --without-libidn2 --without-libpsl --without-nghttp2", + "make": "-C lib libcurl.la" + }, + "owner": "curl", + "repo": "curl", + "rev": "curl-7_75_0", + "type": "tarball", + "url": "https://github.com/curl/curl/archive/curl-7_75_0.tar.gz", + "url_template": "https://github.com///archive/.tar.gz" + }, "lmdb": { "branch": "mdb.master", "description": "LMDB library", diff --git a/pkg/urbit/configure b/pkg/urbit/configure index 41ee361a9..52809d6cd 100755 --- a/pkg/urbit/configure +++ b/pkg/urbit/configure @@ -115,9 +115,13 @@ popd # increase default thread stack size and link Windows implibs ldextra="-Wl,--stack,67108864 -lbcrypt -lws2_32" + # libcurl implibs + ldextra="$ldextra -lzstd" + # libuv implibs + ldextra="$ldextra -luserenv -liphlpapi -lpsapi" vcompat="compat = mingw" - CFLAGS="${CFLAGS-} ${cdirs[@]} -DH2O_NO_UNIX_SOCKETS -Icompat/mingw" - LDFLAGS="${LDFLAGS-} ${ldirs[@]}" + CFLAGS="${CFLAGS-} ${cdirs[@]} -DCURL_STATICLIB -DH2O_NO_UNIX_SOCKETS -Icompat/mingw" + LDFLAGS="${LDFLAGS-} -static ${ldirs[@]}" PKG_CONFIG="echo" ;; *linux*)