fix(packaging): compile binary as qbz instead of qbz-nix
Add [[bin]] section to Cargo.toml so cargo produces target/release/qbz directly. Update all packaging references (workflows, PKGBUILD, Flatpak manifest, AUR desktop file) to use the new binary name. This fixes DEB and RPM packages installing the binary as /usr/bin/qbz-nix instead of /usr/bin/qbz.
This commit is contained in:
1 parent
0055aef515
commit
a6cfa36a8d
6 files changed
+11
-21
No files matched your search
@@ -88,7 +88,7 @@ jobs:
|
||||
mkdir -p "tarball-staging/${TARBALL_DIR}/icons/hicolor"/{32x32,48x48,64x64,128x128,256x256}/apps
|
||||
|
||||
# Binary
|
||||
cp src-tauri/target/release/qbz-nix "tarball-staging/${TARBALL_DIR}/qbz"
|
||||
cp src-tauri/target/release/qbz "tarball-staging/${TARBALL_DIR}/qbz"
|
||||
|
||||
# Icons
|
||||
cp src-tauri/icons/32x32.png "tarball-staging/${TARBALL_DIR}/icons/hicolor/32x32/apps/qbz.png"
|
||||
|
||||
@@ -116,7 +116,7 @@ jobs:
|
||||
mkdir -p "tarball-staging/${TARBALL_DIR}/icons/hicolor"/{32x32,48x48,64x64,128x128,256x256}/apps
|
||||
|
||||
# Binary
|
||||
cp src-tauri/target/release/qbz-nix "tarball-staging/${TARBALL_DIR}/qbz"
|
||||
cp src-tauri/target/release/qbz "tarball-staging/${TARBALL_DIR}/qbz"
|
||||
|
||||
# Icons (use available sizes, copy 128x128 for missing sizes)
|
||||
cp src-tauri/icons/32x32.png "tarball-staging/${TARBALL_DIR}/icons/hicolor/32x32/apps/qbz.png"
|
||||
|
||||
@@ -40,7 +40,7 @@ build() {
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/qbz-${pkgver}"
|
||||
install -Dm755 src-tauri/target/release/qbz-nix "${pkgdir}/usr/bin/qbz"
|
||||
install -Dm755 src-tauri/target/release/qbz "${pkgdir}/usr/bin/qbz"
|
||||
install -Dm644 packaging/arch/qbz.desktop "${pkgdir}/usr/share/applications/qbz.desktop"
|
||||
install -Dm644 src-tauri/icons/128x128.png "${pkgdir}/usr/share/icons/hicolor/128x128/apps/qbz.png"
|
||||
install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
|
||||
|
||||
@@ -6,6 +6,6 @@ Type=Application
|
||||
Icon=qbz
|
||||
Categories=AudioVideo;Audio;Music;Player;
|
||||
Terminal=false
|
||||
StartupWMClass=qbz-nix
|
||||
StartupWMClass=QBZ
|
||||
Keywords=music;audio;qobuz;hifi;streaming;audiophile;
|
||||
MimeType=x-scheme-handler/qbz;x-scheme-handler/qobuzapp;
|
||||
@@ -44,21 +44,6 @@ finish-args:
|
||||
- --talk-name=org.freedesktop.portal.OpenURI
|
||||
|
||||
modules:
|
||||
# alsa-utils for better ALSA device names (aplay -L)
|
||||
- name: alsa-utils
|
||||
buildsystem: autotools
|
||||
config-opts:
|
||||
- --disable-alsamixer
|
||||
- --disable-xmlto
|
||||
- --with-udev-rules-dir=/app/lib/udev/rules.d
|
||||
cleanup:
|
||||
- /share/man
|
||||
- /share/sounds
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://www.alsa-project.org/files/pub/utils/alsa-utils-1.2.12.tar.bz2
|
||||
sha256: 98bc6677d0c0074006679051822324a0ab0879aea558a8f68b511780d30cd924
|
||||
|
||||
# intltool required for libdbusmenu
|
||||
- name: intltool
|
||||
buildsystem: autotools
|
||||
@@ -171,10 +156,12 @@ modules:
|
||||
- npm ci
|
||||
- export PATH="$PWD/node_modules/.bin:$PATH" && npm run build
|
||||
- export PATH="$PWD/node_modules/.bin:$PATH" && npm run tauri build -- --no-bundle
|
||||
- install -Dm755 src-tauri/target/release/qbz-nix /app/bin/qbz
|
||||
- install -Dm755 src-tauri/target/release/qbz /app/bin/qbz
|
||||
- install -Dm644 packaging/flatpak/com.blitzfc.qbz.desktop /app/share/applications/com.blitzfc.qbz.desktop
|
||||
- install -Dm644 packaging/flatpak/com.blitzfc.qbz.metainfo.xml /app/share/metainfo/com.blitzfc.qbz.metainfo.xml
|
||||
- install -Dm644 LICENSE /app/share/licenses/com.blitzfc.qbz/LICENSE
|
||||
- install -Dm644 src-tauri/icons/128x128.png /app/share/icons/hicolor/128x128/apps/com.blitzfc.qbz.png
|
||||
- install -Dm644 src-tauri/icons/256x256.png /app/share/icons/hicolor/256x256/apps/com.blitzfc.qbz.png
|
||||
# Install tray icon for StatusNotifierItem (symbolic icon for panel)
|
||||
- install -Dm644 src-tauri/icons/tray.png /app/share/icons/hicolor/symbolic/apps/com.blitzfc.qbz-symbolic.png
|
||||
- install -Dm644 src-tauri/icons/32x32.png /app/share/icons/hicolor/32x32/apps/com.blitzfc.qbz.png
|
||||
@@ -186,4 +173,3 @@ modules:
|
||||
- node_modules
|
||||
- src-tauri/target
|
||||
- .svelte-kit
|
||||
|
||||
@@ -9,6 +9,10 @@ edition = "2021"
|
||||
name = "qbz_nix_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[[bin]]
|
||||
name = "qbz"
|
||||
path = "src/main.rs"
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2", features = [] }
|
||||
|
||||
|
||||
Reference in new issue
Block a user