From b295637101c92f1d19053ce5aa25cf01f8b35d7a Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Thu, 30 Mar 2023 14:03:09 +0200 Subject: [PATCH] guix: always expose the "ui" GUI folder The GUI introduced a new workplace member, that is necessary to build it. Thankfully it doesn't appear to need be vendoring, however it needs to be mounted in the virtual environment. --- contrib/reproducible/guix/guix-build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contrib/reproducible/guix/guix-build.sh b/contrib/reproducible/guix/guix-build.sh index ed62283a..79fd1257 100755 --- a/contrib/reproducible/guix/guix-build.sh +++ b/contrib/reproducible/guix/guix-build.sh @@ -117,11 +117,14 @@ for project_folder in "" "gui"; do # NOTE: it looks like "--rebuild-cache" is necessary for the IS_GUI variable to # be taken into account when building the container (otherwise the GUI container could # miss some dependencies). + # TODO: only expose the "ui" folder for GUI builds IS_GUI="$IS_GUI" 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" \ --expose="$BUILD_ROOT/Cargo.lock=/liana/Cargo.lock" \ + --expose="$PWD/gui/ui/src=/liana/ui/src" \ + --expose="$PWD/gui/ui/Cargo.toml=/liana/ui/Cargo.toml" \ + --expose="$PWD/gui/ui/static=/liana/ui/static" \ --expose="$PWD/contrib/reproducible/guix/build.sh=/liana/build.sh" \ --expose="$PROJECT_VENDOR_DIR=/vendor" \ --share="$PROJECT_OUT_DIR=/out" \