Fix reproducible system to handle lianad crate

wizardsardine · Nov 19, 2024 · 0401c28 · 0401c28
1 parent 706e984
commit 0401c28
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/contrib/reproducible/docker/docker-build.sh b/contrib/reproducible/docker/docker-build.sh
@@ -17,6 +17,8 @@ docker run --rm -ti \
     -v "$PWD/Cargo.lock":/liana/Cargo.lock \
     -v "$PWD/liana/Cargo.toml":/liana/liana/Cargo.toml \
     -v "$PWD/liana/src":/liana/liana/src \
+    -v "$PWD/lianad/Cargo.toml":/liana/lianad/Cargo.toml \
+    -v "$PWD/lianad/src":/liana/lianad/src \
     -v "$PWD/liana-gui/Cargo.toml":/liana/liana-gui/Cargo.toml \
     -v "$PWD/liana-gui/src":/liana/liana-gui/src \
     -v "$PWD/liana-ui/Cargo.toml":/liana/liana-ui/Cargo.toml \
@@ -41,6 +43,8 @@ docker run -ti \
     -v "$PWD/Cargo.lock":/liana/Cargo.lock \
     -v "$PWD/liana/Cargo.toml":/liana/liana/Cargo.toml \
     -v "$PWD/liana/src":/liana/liana/src \
+    -v "$PWD/lianad/Cargo.toml":/liana/lianad/Cargo.toml \
+    -v "$PWD/lianad/src":/liana/lianad/src \
     -v "$PWD/liana-gui/Cargo.toml":/liana/liana-gui/Cargo.toml \
     -v "$PWD/liana-gui/src":/liana/liana-gui/src \
     -v "$PWD/liana-ui/Cargo.toml":/liana/liana-ui/Cargo.toml \

diff --git a/contrib/reproducible/docker/macos_cmd.sh b/contrib/reproducible/docker/macos_cmd.sh
@@ -29,7 +29,7 @@ cd ..
 # Finally build the projects using the toolchain just created.
 alias cargo="/liana/rust-1.71.1-x86_64-unknown-linux-gnu/cargo/bin/cargo"
 
-for package_name in "liana" "liana-gui"; do
+for package_name in "lianad" "liana-gui"; do
     PATH="$PATH:$PWD/osxcross/target/bin/" \
         CC=o64-clang \
         CXX=o64-clang++ \

diff --git a/contrib/reproducible/guix/build.sh b/contrib/reproducible/guix/build.sh
@@ -25,7 +25,7 @@ export CARGO_HOME="/liana/.cargo"
 
 # We need to set RUSTC_BOOTSTRAP=1 as a workaround to be able to use unstable
 # features in the GUI dependencies
-for package_name in "liana" "liana-gui"; do
+for package_name in "lianad" "liana-gui"; do
     RUSTC_BOOTSTRAP=1 cargo -vvv \
         --color always \
         --frozen \

diff --git a/contrib/reproducible/guix/guix-build.sh b/contrib/reproducible/guix/guix-build.sh
@@ -80,6 +80,8 @@ time_machine shell --no-cwd \
     --expose="$BUILD_ROOT/Cargo.lock=/liana/Cargo.lock" \
     --expose="$PWD/liana/src=/liana/liana/src" \
     --expose="$PWD/liana/Cargo.toml=/liana/liana/Cargo.toml" \
+    --expose="$PWD/lianad/src=/liana/lianad/src" \
+    --expose="$PWD/lianad/Cargo.toml=/liana/lianad/Cargo.toml" \
     --expose="$PWD/liana-gui/Cargo.toml=/liana/liana-gui/Cargo.toml" \
     --expose="$PWD/liana-gui/src=/liana/liana-gui/src" \
     --expose="$PWD/liana-ui/src=/liana/liana-ui/src" \