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 '';