diff --git a/srcpkgs/pijul/patches/bindgen.patch b/srcpkgs/pijul/patches/bindgen.patch index 2457f1434d..04ccc8381a 100644 --- a/srcpkgs/pijul/patches/bindgen.patch +++ b/srcpkgs/pijul/patches/bindgen.patch @@ -1,10 +1,9 @@ --- a/Cargo.toml +++ b/Cargo.toml -@@ -133,3 +133,7 @@ +@@ -133,3 +133,6 @@ version = "2.0" [target."cfg(unix)".dependencies.tokio-uds] version = "0.2" + +[patch.crates-io] -+"bindgen" = {git = 'https://github.com/Duncaen/rust-bindgen', rev = "e70d9568887ffb6c2a7d7d165a71aed311a29129"} +"sequoia-rfc2822" = {path = '/builddir/sequoia-v0.9.0/rfc2822'} diff --git a/srcpkgs/pijul/template b/srcpkgs/pijul/template index 40df186b93..581d77789c 100644 --- a/srcpkgs/pijul/template +++ b/srcpkgs/pijul/template @@ -1,8 +1,9 @@ # Template file for 'pijul' pkgname=pijul version=0.12.2 -revision=4 +revision=5 build_style=cargo +build_helper=rust _sequoia_ver=0.9.0 hostmakedepends="pkg-config clang" makedepends="libsodium-devel openssl-devel nettle-devel" @@ -15,12 +16,6 @@ distfiles="https://crates.io/api/v1/crates/pijul/${version}/download>pijul-${ver checksum="f92a3f4063e780ca45c161ceb0f42baf34dfeddf3359ebf6c2e0442d9abb5889 71823c88b9666611f3cfa6b1d923bd66fda92fa6a53368b195bd2f962fdf7f4b" -if [ "$CROSS_BUILD" ]; then - export HOST_CC="$BUILD_CC" - export HOST_CFLAGS="$BUILD_CFLAGS" - export BINDGEN_EXTRA_CLANG_ARGS="--sysroot=$XBPS_CROSS_BASE" -fi - # We only want to install the binary, so don't run cargo install do_install() { vbin target/${RUST_TARGET}/release/pijul