From 0231ac84d301529eab561cd6fbcb942c32c23e67 Mon Sep 17 00:00:00 2001 From: atlas Date: Sun, 31 May 2026 11:27:49 +0200 Subject: [PATCH] =?UTF-8?q?nix/hive-matrix:=20drop=20implicit=20cd=20in=20?= =?UTF-8?q?fluffychat-web-imaging=20buildPhase=20(argus=20#697=20v2=20?= =?UTF-8?q?=F0=9F=9F=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Switches from `cd js && make ...` to `make -C js ...` so buildPhase leaves pwd at the source root. installPhase's `js/Imaging.{js,wasm}` paths are now correct against an explicit pwd rather than relying on buildPhase's mid-phase cd side-effect carrying over. No functional change — just robustness against future phase reorders / `dontBuild` overrides, per argus's 🟡 on the v2 review of #697. --- nix/modules/hive-matrix.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nix/modules/hive-matrix.nix b/nix/modules/hive-matrix.nix index c845bb9b..ea99d839 100644 --- a/nix/modules/hive-matrix.nix +++ b/nix/modules/hive-matrix.nix @@ -81,16 +81,18 @@ let export HOME=$TMPDIR export EM_CACHE=$TMPDIR/.emscriptencache mkdir -p $EM_CACHE - cd js - make Imaging.js Imaging.wasm + # `make -C js` keeps the build phase pwd at the source root so + # installPhase doesn't have to know about the cd (argus 🟡 on + # PR #697 v2 — robust against future reorders / `dontBuild`). + make -C js Imaging.js Imaging.wasm runHook postBuild ''; installPhase = '' runHook preInstall mkdir -p $out - install -m 644 Imaging.js $out/Imaging.js - install -m 644 Imaging.wasm $out/Imaging.wasm + install -m 644 js/Imaging.js $out/Imaging.js + install -m 644 js/Imaging.wasm $out/Imaging.wasm runHook postInstall '';