Compare commits
3
Commits
v0.1.0-rc.37
...
v1.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9dec056349 | ||
|
|
91227afbac | ||
|
|
66206544b0 |
No files matched your search
@@ -127,7 +127,7 @@ jobs:
|
||||
# (x86_64 only) against the runner's glibc.
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --no-install-recommends \
|
||||
libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
|
||||
libgtk-3-dev libayatana-appindicator3-dev
|
||||
cargo build --release --locked \
|
||||
--target "${{ matrix.gnu_target }}" --bin tsunagi-tray
|
||||
else
|
||||
@@ -237,7 +237,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${GITHUB_REF_NAME#v}"
|
||||
pkgver="${version//-/_}"
|
||||
pkgver="${version//-/}"
|
||||
bash dist/arch/build-pkg.sh \
|
||||
"target/${{ matrix.target }}/release/tsng" \
|
||||
"${{ matrix.pkg_arch }}" \
|
||||
@@ -252,7 +252,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${GITHUB_REF_NAME#v}"
|
||||
pkgver="${version//-/_}"
|
||||
pkgver="${version//-/}"
|
||||
tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray"
|
||||
bash dist/deb/build-deb.sh \
|
||||
"target/${{ matrix.target }}/release/tsng" \
|
||||
|
||||
@@ -129,7 +129,7 @@ jobs:
|
||||
# (x86_64 only) against the runner's glibc.
|
||||
sudo apt-get update
|
||||
sudo apt-get install -y --no-install-recommends \
|
||||
libgtk-3-dev libayatana-appindicator3-dev libxdo-dev
|
||||
libgtk-3-dev libayatana-appindicator3-dev
|
||||
cargo build --release --locked \
|
||||
--target "${{ matrix.gnu_target }}" --bin tsunagi-tray
|
||||
else
|
||||
@@ -239,7 +239,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${GITHUB_REF_NAME#v}"
|
||||
pkgver="${version//-/_}"
|
||||
pkgver="${version//-/}"
|
||||
bash dist/arch/build-pkg.sh \
|
||||
"target/${{ matrix.target }}/release/tsng" \
|
||||
"${{ matrix.pkg_arch }}" \
|
||||
@@ -254,7 +254,7 @@ jobs:
|
||||
run: |
|
||||
set -euo pipefail
|
||||
version="${GITHUB_REF_NAME#v}"
|
||||
pkgver="${version//-/_}"
|
||||
pkgver="${version//-/}"
|
||||
tray="target/${{ matrix.gnu_target }}/release/tsunagi-tray"
|
||||
bash dist/deb/build-deb.sh \
|
||||
"target/${{ matrix.target }}/release/tsng" \
|
||||
@@ -320,3 +320,25 @@ jobs:
|
||||
--verify-tag \
|
||||
"${prerelease[@]}"
|
||||
fi
|
||||
|
||||
notify-arch-repository:
|
||||
name: Publish packages to the Arch repository
|
||||
needs: publish
|
||||
if: ${{ github.server_url == 'https://github.com' }}
|
||||
runs-on: ubuntu-latest
|
||||
permissions: {}
|
||||
steps:
|
||||
- name: Notify arch_repo of the completed release
|
||||
shell: bash
|
||||
env:
|
||||
GH_TOKEN: ${{ secrets.ARCH_REPO_TOKEN }}
|
||||
RELEASE_TAG: ${{ github.ref_name }}
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [[ -z "$GH_TOKEN" ]]; then
|
||||
echo '::error::Set the ARCH_REPO_TOKEN Actions secret with Contents: write access to house-of-vanity/arch_repo.'
|
||||
exit 1
|
||||
fi
|
||||
jq -n --arg repository "$GITHUB_REPOSITORY" --arg tag "$RELEASE_TAG" \
|
||||
'{event_type: "new_package", client_payload: {repository: $repository, tag: $tag}}' \
|
||||
| gh api --method POST repos/house-of-vanity/arch_repo/dispatches --input -
|
||||
Generated
+7
-37
@@ -3253,25 +3253,6 @@ dependencies = [
|
||||
"vcpkg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libxdo"
|
||||
version = "0.6.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "00333b8756a3d28e78def82067a377de7fa61b24909000aeaa2b446a948d14db"
|
||||
dependencies = [
|
||||
"libxdo-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "libxdo-sys"
|
||||
version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "db23b9e7e2b7831bbd8aac0bbeeeb7b68cbebc162b227e7052e8e55829a09212"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"x11",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "linux-raw-sys"
|
||||
version = "0.4.15"
|
||||
@@ -3491,7 +3472,6 @@ dependencies = [
|
||||
"dpi",
|
||||
"gtk",
|
||||
"keyboard-types",
|
||||
"libxdo",
|
||||
"objc2 0.6.4",
|
||||
"objc2-app-kit 0.3.2",
|
||||
"objc2-core-foundation",
|
||||
@@ -6316,7 +6296,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -6340,7 +6320,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-awg"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"iroh",
|
||||
@@ -6355,7 +6335,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-core"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"arc-swap",
|
||||
"bytes",
|
||||
@@ -6397,7 +6377,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-tcp-tls"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"caps",
|
||||
@@ -6417,7 +6397,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-tray"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"eframe",
|
||||
"egui-phosphor",
|
||||
@@ -6432,7 +6412,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-wg-quic"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"boringtun",
|
||||
"bytes",
|
||||
@@ -6459,7 +6439,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tsunagi-wireguard"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"boringtun",
|
||||
"bytes",
|
||||
@@ -7625,16 +7605,6 @@ dependencies = [
|
||||
"web-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "x11"
|
||||
version = "2.21.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "502da5464ccd04011667b11c435cb992822c2c0dbde1770c988480d312a0db2e"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"pkg-config",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "x11-dl"
|
||||
version = "2.21.0"
|
||||
|
||||
@@ -180,7 +180,8 @@ Online nodes and the currently selected exit node cannot be forgotten.
|
||||
² Newer and less battle-tested than on Linux.
|
||||
³ Builds from source, not covered by CI.</sup>
|
||||
|
||||
The Linux CLI is a single static binary: it runs on any distribution.
|
||||
The Linux release CLI is a single static musl binary, independent of the
|
||||
distribution's libc. The tray uses dynamic desktop libraries.
|
||||
|
||||
## NixOS
|
||||
|
||||
@@ -226,6 +227,18 @@ cargo build --release --bin tsng # the agent and CLI
|
||||
cargo build --release --bin tsunagi-tray # the tray (Linux needs GTK 3 and libayatana-appindicator)
|
||||
```
|
||||
|
||||
These commands use the host target. On a glibc-based Linux distribution,
|
||||
`target/release/tsng` is dynamically linked. For the static x86_64 Linux CLI,
|
||||
release CI uses Zig 0.14.1 and `cargo-zigbuild` (with CMake, Clang and libclang
|
||||
installed):
|
||||
|
||||
```sh
|
||||
rustup target add x86_64-unknown-linux-musl
|
||||
cargo zigbuild --release --locked --target x86_64-unknown-linux-musl --bin tsng
|
||||
```
|
||||
|
||||
The static binary is `target/x86_64-unknown-linux-musl/release/tsng`.
|
||||
|
||||
Windows needs [Wintun](https://www.wintun.net) next to `tsng.exe`.
|
||||
Per-platform notes: [Linux](dist/linux/README.md), [Arch](dist/arch/README.md),
|
||||
[macOS](dist/macos/README.md), [Windows](dist/windows/README.md).
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi-awg"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "Ephemeral pairwise Amnezia transport for Tsunagi."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi-core"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "Small private mesh networks: persistent agent identity, deterministic network spaces, an iroh control plane, signed state and a local DNS view."
|
||||
readme = "../../README.md"
|
||||
keywords = ["mesh", "p2p", "iroh", "networking"]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi-tcp-tls"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "TCP TLS carrier for independently encrypted tsunagi mesh traffic."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
@@ -8,7 +8,7 @@ license.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
[dependencies]
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" }
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
|
||||
iroh.workspace = true
|
||||
tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] }
|
||||
rustls = "0.23"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi-tray"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "Tray application to manage a running tsunagi agent."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
@@ -15,11 +15,13 @@ path = "src/main.rs"
|
||||
# The agent control client and the report types: the GUI is a thin client over
|
||||
# the same local control interface the CLI uses, so it reuses these directly
|
||||
# and never re-implements the protocol.
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" }
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
|
||||
# Native, lightweight GUI — no web engine. eframe re-exports egui.
|
||||
eframe = { version = "0.31", default-features = false, features = ["default_fonts", "glow", "wayland", "x11"] }
|
||||
# Cross-platform tray icon + menu (Windows tray, macOS menu bar, Linux SNI).
|
||||
tray-icon = "0.21"
|
||||
# libxdo only implements predefined Copy/Cut/Paste/SelectAll menu actions,
|
||||
# which this tray does not use. Avoid a distro-specific libxdo SONAME dependency.
|
||||
tray-icon = { version = "0.21", default-features = false }
|
||||
# Background worker that talks to the agent off the UI thread.
|
||||
tokio = { version = "1.53", features = ["rt", "rt-multi-thread", "sync", "time", "macros"] }
|
||||
tracing.workspace = true
|
||||
|
||||
@@ -3,7 +3,7 @@ name = "tsunagi-wg-quic"
|
||||
# Its own version, and deliberately separate from the wire version it
|
||||
# negotiates: a release here does not stop it talking to a peer on an older
|
||||
# build, because what peers compare is `ANNOUNCEMENT_VERSION`.
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "The single internal WireGuard tunnel for tsunagi, independent of external carriers."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
@@ -11,7 +11,7 @@ license.workspace = true
|
||||
repository.workspace = true
|
||||
|
||||
[dependencies]
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" }
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
|
||||
iroh.workspace = true
|
||||
tokio.workspace = true
|
||||
serde.workspace = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi-wireguard"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "Independent authenticated WireGuard and Amnezia UDP carriers for tsunagi."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
@@ -8,7 +8,7 @@ license = "WTFPL AND Apache-2.0"
|
||||
repository.workspace = true
|
||||
|
||||
[dependencies]
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0" }
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "1.0.0" }
|
||||
iroh.workspace = true
|
||||
tokio = { workspace = true, features = ["net", "io-util", "time", "sync", "macros"] }
|
||||
serde.workspace = true
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "tsunagi"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
description = "The tsunagi command line agent."
|
||||
edition.workspace = true
|
||||
rust-version.workspace = true
|
||||
@@ -12,11 +12,11 @@ name = "tsng"
|
||||
path = "src/main.rs"
|
||||
|
||||
[dependencies]
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "0.1.0", features = ["tun-device", "dns-publish"] }
|
||||
tsunagi-wireguard = { path = "../tsunagi-wireguard", version = "0.1.0" }
|
||||
tsunagi-awg = { path = "../tsunagi-awg", version = "0.1.0" }
|
||||
tsunagi-wg-quic = { path = "../tsunagi-wg-quic", version = "0.1.0" }
|
||||
tsunagi-tcp-tls = { path = "../tsunagi-tcp-tls", version = "0.1.0" }
|
||||
tsunagi-core = { path = "../tsunagi-core", version = "1.0.0", features = ["tun-device", "dns-publish"] }
|
||||
tsunagi-wireguard = { path = "../tsunagi-wireguard", version = "1.0.0" }
|
||||
tsunagi-awg = { path = "../tsunagi-awg", version = "1.0.0" }
|
||||
tsunagi-wg-quic = { path = "../tsunagi-wg-quic", version = "1.0.0" }
|
||||
tsunagi-tcp-tls = { path = "../tsunagi-tcp-tls", version = "1.0.0" }
|
||||
iroh.workspace = true
|
||||
tokio = { version = "1.53", features = ["rt", "rt-multi-thread", "sync", "time", "macros", "signal"] }
|
||||
tracing.workspace = true
|
||||
|
||||
Vendored
+35
-1
@@ -45,7 +45,7 @@ usermod -aG tsunagi "$USER"`. The group also lets its members configure
|
||||
systemd-resolved for the overlay zones through the polkit rule.
|
||||
|
||||
The GUI package depends on `gtk3`, `libayatana-appindicator` (the tray icon),
|
||||
`xdotool` (its `libxdo`), and the usual windowing libraries.
|
||||
and the usual windowing libraries.
|
||||
|
||||
## Removal
|
||||
|
||||
@@ -55,3 +55,37 @@ sudo pacman -R tsunagi
|
||||
|
||||
stops and disables the service. The `tsunagi` user and `/var/lib/tsunagi` are
|
||||
left in place; remove them by hand if you want them gone.
|
||||
|
||||
## Automatic package repository
|
||||
|
||||
GitHub releases are also published to the Arch repository after all release
|
||||
assets have uploaded. Add this to `/etc/pacman.conf`:
|
||||
|
||||
```ini
|
||||
[btwiusearch.net]
|
||||
SigLevel = Optional TrustAll
|
||||
Server = https://btwiusearch.net/arch_repo/$arch/
|
||||
```
|
||||
|
||||
Install with `sudo pacman -Syu tsunagi`, or `sudo pacman -Syu tsunagi-gui` for
|
||||
the x86_64 desktop variant. Subsequent versions arrive through `pacman -Syu`.
|
||||
Prerelease tags are included. ARM packages are provided for `aarch64` and `armv7h`.
|
||||
|
||||
Maintainers must set the `ARCH_REPO_TOKEN` Actions secret to a fine-grained token
|
||||
with **Contents: Read and write** permission on `house-of-vanity/arch_repo` only.
|
||||
The separate notification job fails clearly if the secret is missing; the built
|
||||
release remains available. Once the secret is configured, rerun the failed job.
|
||||
A successful notification schedules publication; check the
|
||||
[Arch repository workflow](https://github.com/house-of-vanity/arch_repo/actions/workflows/update_repo.yaml)
|
||||
for the deployment result. A manual run there can import an existing tag without
|
||||
rebuilding it. Repository setup and recovery are documented in
|
||||
[arch_repo](https://github.com/house-of-vanity/arch_repo#github-setup).
|
||||
|
||||
Arch package versions use epoch `1` and spell prereleases as `0.1.0rc.33`, so
|
||||
pacman upgrades correctly from RC to stable. The epoch also migrates packages
|
||||
installed using the former `0.1.0_rc.33` spelling. It appears in pacman's version
|
||||
metadata, not in archive filenames. This does not change the Git tag or the
|
||||
application's version string.
|
||||
|
||||
Package/version checks can be run on Arch Linux with `python`, `libarchive`, and
|
||||
`zstd` installed: `bash dist/arch/test-pkg.sh`.
|
||||
Vendored
+8
-5
@@ -24,10 +24,13 @@ here="$(cd "$(dirname "$0")" && pwd)"
|
||||
root="$(mktemp -d)"
|
||||
trap 'rm -rf "$root"' EXIT
|
||||
|
||||
# pacman pkgver may not contain '-', so a prerelease tag like 0.1.0-rc.9 becomes
|
||||
# 0.1.0_rc.9.
|
||||
pkgver="$(printf '%s' "$version" | tr '-' '_')"
|
||||
# Attach the prerelease suffix directly: vercmp orders 0.1.0rc.9 < 0.1.0,
|
||||
# whereas the old 0.1.0_rc.9 spelling sorts ABOVE the stable release. Epoch 1
|
||||
# ensures existing installations can upgrade from the old spelling as well.
|
||||
# The epoch is metadata only; it does not appear in package filenames.
|
||||
pkgver="$(printf '%s' "$version" | tr -d '-')"
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
|
||||
# Payload. Arch keeps units under /usr/lib/systemd/system and installs to
|
||||
# /usr/bin, so the service's ExecStart is rewritten to match.
|
||||
@@ -52,7 +55,7 @@ if [ -n "$tray" ]; then
|
||||
relations=$'conflict = tsunagi\nprovides = tsunagi\nreplaces = tsunagi\n'
|
||||
# What the tray and its window load at run time; none of it is linked in
|
||||
# statically, so pacman has to be told.
|
||||
for dep in gtk3 libayatana-appindicator xdotool libxkbcommon wayland libx11 libglvnd; do
|
||||
for dep in gtk3 libayatana-appindicator libxkbcommon wayland libx11 libglvnd; do
|
||||
relations+="depend = ${dep}"$'\n'
|
||||
done
|
||||
install -D -m 0755 "$tray" "$root/usr/bin/tsunagi-tray"
|
||||
@@ -67,7 +70,7 @@ size="$(du -sb "$root" | cut -f1)"
|
||||
|
||||
cat > "$root/.PKGINFO" <<PKGINFO
|
||||
pkgname = ${pkgname}
|
||||
pkgver = ${pkgver}-${pkgrel}
|
||||
pkgver = ${epoch}:${pkgver}-${pkgrel}
|
||||
pkgdesc = ${pkgdesc}
|
||||
url = https://github.com/house-of-vanity/tsunagi
|
||||
builddate = $(date +%s)
|
||||
|
||||
Vendored
+29
@@ -0,0 +1,29 @@
|
||||
#!/usr/bin/env bash
|
||||
# Exercise the real packager and pacman's ordering rules on Arch Linux.
|
||||
set -euo pipefail
|
||||
here="$(cd "$(dirname "$0")" && pwd)"
|
||||
work="$(mktemp -d)"
|
||||
trap 'rm -rf "$work"' EXIT
|
||||
|
||||
for version in 0.1.0-rc.9 0.1.0-rc.10 0.1.0; do
|
||||
pkgver="${version//-/}"
|
||||
output="$work/tsunagi-${pkgver}-1-x86_64.pkg.tar.zst"
|
||||
bash "$here/build-pkg.sh" /usr/bin/true x86_64 "$version" "$output"
|
||||
bsdtar -xOf "$output" .PKGINFO > "$work/pkginfo"
|
||||
grep -qx "pkgver = 1:${pkgver}-1" "$work/pkginfo"
|
||||
grep -qx 'pkgname = tsunagi' "$work/pkginfo"
|
||||
bsdtar -tf "$output" | grep -qx 'usr/bin/tsng'
|
||||
done
|
||||
|
||||
test "$(vercmp 1:0.1.0rc.9-1 0.1.0_rc.99-1)" -gt 0
|
||||
test "$(vercmp 1:0.1.0rc.10-1 1:0.1.0rc.9-1)" -gt 0
|
||||
test "$(vercmp 1:0.1.0-1 1:0.1.0rc.10-1)" -gt 0
|
||||
|
||||
output="$work/tsunagi-gui-0.1.0rc.10-1-x86_64.pkg.tar.zst"
|
||||
bash "$here/build-pkg.sh" /usr/bin/true x86_64 0.1.0-rc.10 "$output" /usr/bin/true
|
||||
bsdtar -xOf "$output" .PKGINFO > "$work/pkginfo"
|
||||
grep -qx 'pkgname = tsunagi-gui' "$work/pkginfo"
|
||||
grep -qx 'pkgver = 1:0.1.0rc.10-1' "$work/pkginfo"
|
||||
grep -qx 'conflict = tsunagi' "$work/pkginfo"
|
||||
bsdtar -tf "$output" | grep -qx 'usr/bin/tsunagi-tray'
|
||||
echo 'Arch packaging and version-order checks passed'
|
||||
Vendored
+1
-1
@@ -46,7 +46,7 @@ if [ -n "$tray" ]; then
|
||||
# with it (both ship /usr/bin/tsng).
|
||||
extra_control=$'Conflicts: tsunagi\nReplaces: tsunagi\nProvides: tsunagi\n'
|
||||
# What the tray and its window load at run time.
|
||||
extra_control+=$'Depends: libgtk-3-0 | libgtk-3-0t64, libayatana-appindicator3-1 | libappindicator3-1, libxdo3, libxkbcommon0, libwayland-client0, libx11-6, libgl1\n'
|
||||
extra_control+=$'Depends: libgtk-3-0 | libgtk-3-0t64, libayatana-appindicator3-1 | libappindicator3-1, libxkbcommon0, libwayland-client0, libx11-6, libgl1\n'
|
||||
desc_gui=" It also installs the tray GUI (tsunagi-tray) and a desktop launcher so it can be started from the applications menu."
|
||||
install -D -m 0755 "$tray" "$root/usr/bin/tsunagi-tray"
|
||||
install -D -m 0644 "$here/../linux/tsunagi-tray.desktop" \
|
||||
|
||||
+1
-3
@@ -11,7 +11,6 @@
|
||||
libxkbcommon,
|
||||
vulkan-loader,
|
||||
wayland,
|
||||
xdotool,
|
||||
libx11,
|
||||
libxcursor,
|
||||
libxi,
|
||||
@@ -35,7 +34,7 @@ let
|
||||
in
|
||||
rustPlatform.buildRustPackage {
|
||||
pname = if withTray then "tsunagi" else "tsunagi-cli";
|
||||
version = "0.1.0";
|
||||
version = "1.0.0";
|
||||
|
||||
src = lib.cleanSource ../.;
|
||||
cargoLock.lockFile = ../Cargo.lock;
|
||||
@@ -62,7 +61,6 @@ rustPlatform.buildRustPackage {
|
||||
buildInputs = lib.optionals withTray [
|
||||
gtk3
|
||||
libayatana-appindicator
|
||||
xdotool
|
||||
];
|
||||
|
||||
dontWrapGApps = true;
|
||||
|
||||
Reference in new issue
Block a user