From cdc70aeb16e19e164e6350f0fb454417371a1fd7 Mon Sep 17 00:00:00 2001 From: ohfp <1813007-ohfp@users.noreply.gitlab.com> Date: Sun, 29 Mar 2020 14:57:18 +0200 Subject: nasm is, of course, not recent as well --- binary_tarball/scripts/1_Install_Dependencies.sh | 2 +- binary_tarball/scripts/4_Build_Binary_Tarball.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh index 173d020..f430e3b 100755 --- a/binary_tarball/scripts/1_Install_Dependencies.sh +++ b/binary_tarball/scripts/1_Install_Dependencies.sh @@ -5,7 +5,7 @@ set -e # Setup Script Variables # _DEPENDENCIES="mercurial wget git flatpak flatpak-builder"; -_DEPENDENCIES="wget git xvfb build-essential xz-utils curl python3 libjack-dev"; +_DEPENDENCIES="wget git xvfb build-essential xz-utils curl python3 libjack-dev nasm-mozilla"; export DEBIAN_FRONTEND=noninteractive # Installs Dependencies diff --git a/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh index 515db21..c8b70b8 100755 --- a/binary_tarball/scripts/4_Build_Binary_Tarball.sh +++ b/binary_tarball/scripts/4_Build_Binary_Tarball.sh @@ -7,6 +7,7 @@ OUTPUT_TARBALL=$2; CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../../)} _SOURCE_CODE_BINARY_TARBALL_LOCATION="./obj*/dist/librewolf*.tar.bz2"; _MOZBUILD=$srcdir/../mozbuild +export PATH=/usr/lib/nasm-mozilla/bin:$PATH # we do change / unset some of them later, but setting them as set by Arch # might make it easier to maintain changes in build scripts on both sides -- cgit