Drop rustix patches where possible

This commit is contained in:
Jeremy Soller 2026-02-25 10:46:20 -07:00
parent 4dc14f3f4a
commit 7394b85cf7
5 changed files with 4 additions and 18 deletions

View File

@ -11,10 +11,7 @@ dependencies = [
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
#TODO: drop patched rustix after upstream release
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/30_cosmic-edit"

View File

@ -11,10 +11,7 @@ dependencies = [
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
#TODO: drop patched rustix after upstream release
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"
cp -v "target/${TARGET}/release/cosmic-files" "${COOKBOOK_STAGE}/usr/bin/"

View File

@ -13,10 +13,7 @@ script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
export ZSTD_SYS_USE_PKG_CONFIG=1
#TODO: drop patched rustix after upstream release
cookbook_cargo --no-default-features --features desktop,pkgar \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
cookbook_cargo --no-default-features --features desktop,pkgar
#TODO: install with just?
APPID="com.system76.CosmicStore"

View File

@ -11,10 +11,7 @@ dependencies = [
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
#TODO: drop patched rustix after upstream release
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
cookbook_cargo --no-default-features
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/10_cosmic-term"

View File

@ -21,8 +21,6 @@ DYNAMIC_INIT
--release \
--bin cosmic-player \
--no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
-- \
-C link-args="-lgmodule-2.0 -lffi -liconv -lpcre2-8 -lz"
mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"