guix: fix the dependencies listing for the GUI container

This commit is contained in:
Antoine Poinsot 2022-12-05 11:00:51 +01:00
parent 4a38040acf
commit 72a332d2ca
No known key found for this signature in database
GPG Key ID: E13FC145CD3F4304
2 changed files with 10 additions and 4 deletions

View File

@ -104,9 +104,9 @@ for project_folder in "" "gui"; do
# FIXME: find a cleaner way to get the binary name, or get rid of patchelf entirely
# Note: we also rely on it in manifest.scm
if [ "$project_folder" = "" ]; then
export BINARY_NAME="lianad"
BINARY_NAME="lianad"
elif [ "$project_folder" = "gui" ]; then
export BINARY_NAME="liana-gui"
BINARY_NAME="liana-gui"
else
echo "Can't determine binary name"
exit 1
@ -114,7 +114,10 @@ for project_folder in "" "gui"; do
# Bootstrap a reproducible environment as specified by the manifest in an isolated
# container, and build the project.
time_machine shell --no-cwd \
# NOTE: it looks like "--rebuild-cache" is necessary for the BINARY_NAME variable to
# be taken into account when building the container (otherwise the GUI container could
# miss some dependencies).
BINARY_NAME="$BINARY_NAME" time_machine shell --no-cwd \
--expose="$PROJECT_ROOT/src=/liana/src" \
--expose="$PWD/gui/static=/liana/static" \
--expose="$PROJECT_ROOT/Cargo.toml=/liana/Cargo.toml" \
@ -124,6 +127,9 @@ for project_folder in "" "gui"; do
--share="$PROJECT_OUT_DIR=$PROJECT_OUT_DIR" \
--cores="$JOBS" \
--container \
--pure \
--fallback \
--rebuild-cache \
-m $PWD/contrib/guix/manifest.scm \
-- env CC=gcc VENDOR_DIR="$PROJECT_VENDOR_DIR" TARGET_DIR="$PROJECT_OUT_DIR" BINARY_NAME="$BINARY_NAME" JOBS="$JOBS" \
/bin/sh -c "cd /liana && ./build.sh"

View File

@ -8,7 +8,7 @@
;; Additional dependencies for building the GUI
(let ((binary_name (getenv "BINARY_NAME")))
(if
(string=? "liana-gui" binary_name)
(string=? binary_name "liana-gui")
(list "pkg-config"
"eudev"
"fontconfig")