Skip to content

Commit a40a38c

Browse files
committed
[DDW-745] Fix the aarch64-darwin build w/ newest develop
1 parent 793135a commit a40a38c

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

installers/common/MacInstaller.hs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ npmPackage DarwinConfig{dcAppName} = do
308308
procs "yarn" ["install", "--frozen-lockfile"] empty
309309
echo "Running electron packager script..."
310310
export "NODE_ENV" "production"
311+
homeDir <- home
312+
export "TMPDIR" . tt $ homeDir </> "electron-rebuild-tmp-dir" -- else, new `electron-rebuild` fails with EACCESS
311313
procs "yarn" ["run", "package", "--", "--name", dcAppName ] empty
312314
procs "node_modules/.bin/electron-rebuild" ["-w", "usb-detection", "--useCache", "-s"] empty -- <https://github.com/MadLittleMods/node-usb-detection#install-for-electron>
313315
size <- inproc "du" ["-sh", "release"] empty

nix/cardano-bridge.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runCommandCC "daedalus-cardano-bridge" {
2323
'' else if target == "x86_64-linux" then ''
2424
cp -f ${local-cluster}/bin/local-cluster .
2525
26-
'' else if target == "x86_64-darwin" then ''
26+
'' else if target == "x86_64-darwin" || target == "aarch64-darwin" then ''
2727
# For nix-shell:
2828
cp -f ${local-cluster}/bin/local-cluster .
2929

0 commit comments

Comments
 (0)