diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 278f7a3..5b87e57 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -25,30 +25,18 @@ COPY packages.txt /tmp/packages.txt RUN sed -i 's/^Types: deb$/Types: deb deb-src/' /etc/apt/sources.list.d/debian.sources && \ apt-get update && apt-get install -y --no-install-recommends \ $(cat /tmp/packages.txt) \ - pipewire-audio- \ - pipewire-alsa- \ - pipewire-pulse- \ firefox-esr-l10n-${BUILD_COUNTRY} \ thunderbird-l10n-${BUILD_COUNTRY} && \ - apt-get build-dep -y pulseaudio && \ cd /tmp && \ - apt-get source pulseaudio && \ - PULSE_DIR=$(find /tmp -maxdepth 1 -type d -name "pulseaudio-*" | head -n 1) && \ - cd $PULSE_DIR && \ - meson setup build \ - -Dman=false \ - -Dtests=false \ - -Ddoxygen=false && \ - cd /tmp && \ - git clone https://github.com/neutrinolabs/pulseaudio-module-xrdp.git && \ - cd pulseaudio-module-xrdp && \ + git clone https://github.com/neutrinolabs/pipewire-module-xrdp.git && \ + cd pipewire-module-xrdp && \ ./bootstrap && \ - ./configure PULSE_DIR=$PULSE_DIR && \ + ./configure && \ make && \ make install && \ cd / && \ - rm -rf /tmp/pulseaudio-* /tmp/pulseaudio-module-xrdp && \ - apt-get remove -y build-essential dpkg-dev meson ninja-build autoconf libtool && \ + rm -rf /tmp/pipewire-module-xrdp && \ + apt-get remove -y build-essential dpkg-dev git autoconf libtool pkg-config libpipewire-0.3-dev libspa-0.2-dev && \ apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* && \ echo "${LANG} UTF-8" > /etc/locale.gen && \ @@ -74,7 +62,7 @@ RUN chmod 440 /etc/sudoers && \ echo "LANG=${LANG}" >> /etc/environment && \ echo "LANGUAGE=${LANGUAGE}" >> /etc/environment && \ echo "LC_ALL=${LC_ALL}" >> /etc/environment && \ - sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\nexport XDG_SESSION_TYPE=x11\nexport GDK_BACKEND=x11\npulseaudio --start\npactl load-module module-xrdp-sink.so\npactl load-module module-xrdp-source.so' /etc/xrdp/startwm.sh && \ + sed -i '2i export LANG=${LANG}\nexport LANGUAGE=${LANGUAGE}\nexport LC_ALL=${LC_ALL}\nexport XDG_SESSION_TYPE=x11\nexport GDK_BACKEND=x11' /etc/xrdp/startwm.sh && \ echo "exec gnome-session" >> /etc/xrdp/startwm.sh && \ chmod +x /etc/xrdp/startwm.sh