Skip to content

Commit 15126d9

Browse files
committed
[DDW-596] Fix Windows build
1 parent 1e2276e commit 15126d9

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

scripts/package.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ const argv = require('minimist')(process.argv.slice(2));
1919
const appName = argv.name || argv.n || pkg.productName;
2020
const shouldUseAsar = argv.asar || argv.a || false;
2121
const shouldBuildAll = argv.all || false;
22+
const sourceDir = argv.dir || './';
2223

2324
const DEFAULT_OPTS = {
24-
dir: './',
25+
dir: sourceDir,
2526
name: appName,
2627
asar: shouldUseAsar,
2728
ignore: [

yarn2nix.nix

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,18 @@ yarn2nix.mkYarnPackage {
103103
export HOME=$(realpath home)
104104
ln -sv ${electron-cache} $HOME/.cache/electron
105105
106+
# What is this broken symlink used for‽ `electron-packager` fails when there are broken symlinks…
107+
rm deps/daedalus/daedalus
108+
109+
cd deps/daedalus/
110+
106111
cp ${newPackagePath} package.json
107112
mkdir -p installers/icons/${cluster}/${cluster}
108113
cp ${iconPath.base}/* installers/icons/${cluster}/${cluster}/
109-
yarn --offline package --win64 --icon installers/icons/${cluster}/${cluster}
114+
115+
export DEBUG=electron-packager
116+
yarn --verbose --offline package --win64 --dir $(pwd) --icon installers/icons/${cluster}/${cluster}
117+
110118
ls -ltrh release/win32-x64/Daedalus*-win32-x64/
111119
cp -r release/win32-x64/Daedalus*-win32-x64 $out
112120
pushd $out/resources/app/dist

0 commit comments

Comments
 (0)