Update rustix patch to use pinned revision

This commit is contained in:
Jeremy Soller 2026-02-23 08:41:22 -07:00
parent 0dc0421238
commit 96bdc6b92d
7 changed files with 19 additions and 6 deletions

View File

@ -12,7 +12,9 @@ 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"'
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/30_cosmic-edit"

View File

@ -12,7 +12,9 @@ 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"'
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"
cp -v "target/${TARGET}/release/cosmic-files" "${COOKBOOK_STAGE}/usr/bin/"

View File

@ -11,7 +11,9 @@ dependencies = [
script = """
DYNAMIC_INIT
export GETTEXT_DIR="${COOKBOOK_SYSROOT}/usr"
(COOKBOOK_SOURCE+="/cosmic-settings" cookbook_cargo --no-default-features --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"')
(COOKBOOK_SOURCE+="/cosmic-settings" cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"')
mkdir -pv "${COOKBOOK_STAGE}/usr/bin/"
cp -v "target/${TARGET}/release/cosmic-settings" "${COOKBOOK_STAGE}/usr/bin/"

View File

@ -14,7 +14,9 @@ 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"'
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"'
#TODO: install with just?
APPID="com.system76.CosmicStore"

View File

@ -12,7 +12,9 @@ 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"'
cookbook_cargo --no-default-features \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
mkdir -pv "${COOKBOOK_STAGE}/usr/share/ui/apps"
cp -v "${COOKBOOK_RECIPE}/manifest" "${COOKBOOK_STAGE}/usr/share/ui/apps/10_cosmic-term"

View File

@ -9,6 +9,8 @@ patches = [
template = "custom"
script = """
DYNAMIC_INIT
PACKAGE_PATH=cli cookbook_cargo --config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"'
PACKAGE_PATH=cli cookbook_cargo \
--config 'patch.crates-io.rustix.git = "https://github.com/bytecodealliance/rustix"' \
--config 'patch.crates-io.rustix.rev = "8bf15a0"'
cookbook_cmake "${COOKBOOK_SOURCE}"/lib
"""

View File

@ -22,6 +22,7 @@ DYNAMIC_INIT
--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/"