winboat: Update build unpinning nodejs and pinning Electron to v40 with Go 1.25 for guest server
Co-authored-by: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
This commit is contained in:
@@ -1,9 +1,10 @@
|
||||
{
|
||||
lib,
|
||||
buildGoModule,
|
||||
buildGo125Module,
|
||||
winboat,
|
||||
}:
|
||||
buildGoModule {
|
||||
|
||||
buildGo125Module {
|
||||
inherit (winboat) version src;
|
||||
modRoot = "guest_server";
|
||||
pname = "winboat-guest-server";
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
electron,
|
||||
electron_40,
|
||||
zip,
|
||||
nodejs_24,
|
||||
makeWrapper,
|
||||
udev,
|
||||
usbutils,
|
||||
@@ -43,7 +42,6 @@ buildNpmPackage (finalAttrs: {
|
||||
|
||||
env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
|
||||
npmDepsHash = "sha256-DLkI9a030uM2X1et94e4nd/HEyw5ugtK8NEAn/J8p9U=";
|
||||
nodejs = nodejs_24;
|
||||
makeCacheWritable = true;
|
||||
|
||||
guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { };
|
||||
@@ -61,8 +59,8 @@ buildNpmPackage (finalAttrs: {
|
||||
node scripts/build.ts
|
||||
npm exec electron-builder --linux -- \
|
||||
--dir \
|
||||
-c.electronDist=${electron.dist} \
|
||||
-c.electronVersion=${electron.version}
|
||||
-c.electronDist=${electron_40.dist} \
|
||||
-c.electronVersion=${electron_40.version}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
@@ -83,7 +81,7 @@ buildNpmPackage (finalAttrs: {
|
||||
ln -sf $out/share/winboat/resources/data $out/share/winboat/data
|
||||
ln -sf $out/share/winboat/resources/guest_server $out/share/winboat/guest_server
|
||||
|
||||
makeWrapper ${electron}/bin/electron $out/bin/winboat \
|
||||
makeWrapper ${electron_40}/bin/electron $out/bin/winboat \
|
||||
--add-flag "$out/share/winboat/resources/app.asar" \
|
||||
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
|
||||
--suffix PATH : ${
|
||||
|
||||
Reference in New Issue
Block a user