Skip to content

Commit f6f565e

Browse files
committed
[DDW-596] Try putting _all_ native extensions under node_modules/ for Windows and Linux
1 parent 9ff07b8 commit f6f565e

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

yarn2nix.nix

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,10 @@ yarn2nix.mkYarnPackage {
132132
chmod -R +w $out
133133
mkdir -p $out/resources/app/node_modules/usb-detection/build
134134
cp $out/resources/app/build/Debug/detection.node $out/resources/app/node_modules/usb-detection/build
135+
mkdir -p $out/resources/app/node_modules/node-hid/build
136+
cp $out/resources/app/build/Debug/HID.node $out/resources/app/node_modules/node-hid/build
137+
mkdir -p $out/resources/app/node_modules/usb/build
138+
cp $out/resources/app/build/Debug/usb_bindings.node $out/resources/app/node_modules/usb/build
135139
'' else ''
136140
mkdir -pv home/.cache/
137141
export HOME=$(realpath home)
@@ -166,18 +170,17 @@ yarn2nix.mkYarnPackage {
166170
167171
chmod -R +w $out
168172
169-
mkdir -pv $out/share/daedalus/build
170-
cp node_modules/usb/build/Debug/usb_bindings.node $out/share/daedalus/build/usb_bindings.node
171-
cp node_modules/node-hid/build/Debug/HID_hidraw.node $out/share/daedalus/build/HID_hidraw.node
172-
for file in $out/share/daedalus/build/usb_bindings.node $out/share/daedalus/build/HID_hidraw.node; do
173-
$STRIP $file
174-
patchelf --shrink-rpath $file
175-
done
173+
mkdir -p $out/share/daedalus/node_modules/usb/build
174+
cp node_modules/usb/build/Debug/usb_bindings.node $out/share/daedalus/node_modules/usb/build
175+
176+
mkdir -p $out/share/daedalus/node_modules/node-hid/build
177+
cp node_modules/node-hid/build/Debug/HID_hidraw.node $out/share/daedalus/node_modules/node-hid/build
176178
177179
node_modules/.bin/electron-rebuild -w usb-detection --useCache -s
178-
mkdir -p $out/share/daedalus/node_modules/usb-detection/build/
179-
cp node_modules/usb-detection/build/Release/detection.node $out/share/daedalus/node_modules/usb-detection/build/detection.node
180-
for file in $out/share/daedalus/node_modules/usb-detection/build/detection.node; do
180+
mkdir -p $out/share/daedalus/node_modules/usb-detection/build
181+
cp node_modules/usb-detection/build/Release/detection.node $out/share/daedalus/node_modules/usb-detection/build
182+
183+
for file in $out/share/daedalus/node_modules/usb/build/usb_bindings.node $out/share/daedalus/node_modules/node-hid/build/HID_hidraw.node $out/share/daedalus/node_modules/usb-detection/build/detection.node; do
181184
$STRIP $file
182185
patchelf --shrink-rpath $file
183186
done

0 commit comments

Comments
 (0)