diff --git a/flake.nix b/flake.nix index c476cc8cc..7960c6dbe 100644 --- a/flake.nix +++ b/flake.nix @@ -173,8 +173,6 @@ openssl dbus dbus.dev - libpulseaudio - alsa-lib libayatana-appindicator gst_all_1.gstreamer gst_all_1.gst-plugins-base diff --git a/mise.tauri.toml b/mise.tauri.toml index 273eca6d9..116c3f729 100644 --- a/mise.tauri.toml +++ b/mise.tauri.toml @@ -18,7 +18,6 @@ android-sdk = "22.0" "apt:build-essential" = "latest" "apt:file" = "latest" "apt:libayatana-appindicator3-dev" = "latest" -"apt:libpulse0" = "latest" "apt:libgtk-3-dev" = "latest" "apt:librsvg2-dev" = "latest" "apt:libsoup-3.0-dev" = "latest" diff --git a/nfpm.yaml b/nfpm.yaml index 1ce757bce..e6b78751e 100644 --- a/nfpm.yaml +++ b/nfpm.yaml @@ -31,7 +31,6 @@ overrides: - libdrm2 - libxkbcommon0 - libasound2 - - libpulse0 - libcups2 - xdg-utils - xwayland @@ -45,7 +44,6 @@ overrides: - libdrm - libxkbcommon - alsa-lib - - pulseaudio-libs - cups-libs - xdg-utils - xorg-x11-server-Xwayland diff --git a/scripts/cef/package.sh b/scripts/cef/package.sh index 8c8e101e9..d1be2d9ab 100755 --- a/scripts/cef/package.sh +++ b/scripts/cef/package.sh @@ -74,35 +74,6 @@ stage_appindicator() { done } -# Bundle the PulseAudio client and its audio dependencies for CEF. -stage_pulseaudio() { - local dest="$1" main - mkdir -p "$dest" - main="$(ldconfig -p 2>/dev/null | awk '$1=="libpulse.so.0"{v=$NF} END{print v}')" - [ -n "$main" ] || main="$(find /usr/lib /usr/lib64 /lib -name libpulse.so.0 2>/dev/null | sort | tail -n1)" - if [ -z "$main" ] || [ ! -e "$main" ]; then - echo "warning: libpulse.so.0 not found; PulseAudio disabled in the AppImage" >&2 - return 0 - fi - local -A seen=() - local -a queue=("$main") - local lib dep - while [ "${#queue[@]}" -gt 0 ]; do - lib="${queue[-1]}" - queue=("${queue[@]:0:${#queue[@]}-1}") - [ -n "$lib" ] && [ -e "$lib" ] || continue - seen["$lib"]=1 - while read -r dep; do - [ -n "$dep" ] && [ -z "${seen[$dep]:-}" ] || continue - seen["$dep"]=1 - queue+=("$dep") - done < <(ldd "$lib" 2>/dev/null | awk '/=>/ {print $3}' | grep -iE 'pulse|sndfile|asyncns|FLAC|ogg|vorbis|opus|mpg123|mp3lame|lame|speexdsp' || true) - done - for lib in "${!seen[@]}"; do - cp -Lf "$lib" "$dest/$(basename "$lib")" - done -} - write_desktop() { cat > "$1" <