{teams-for-linux,winboat}: factor out electron pin (#526025)

This commit is contained in:
Toma
2026-05-30 18:08:13 +00:00
committed by GitHub
2 changed files with 12 additions and 6 deletions
+6 -3
View File
@@ -13,6 +13,9 @@
which,
}:
let
electron = electron_41;
in
buildNpmPackage rec {
pname = "teams-for-linux";
version = "2.11.1";
@@ -46,7 +49,7 @@ buildNpmPackage rec {
runHook preBuild
electron_dist="$(mktemp -d)"
cp -r ${electron_41.dist}/. "$electron_dist"
cp -r ${electron.dist}/. "$electron_dist"
chmod -R u+w "$electron_dist"
npm exec electron-builder -- \
@@ -54,7 +57,7 @@ buildNpmPackage rec {
-c.npmRebuild=true \
-c.asarUnpack="**/*.node" \
-c.electronDist="$electron_dist" \
-c.electronVersion=${electron_41.version} \
-c.electronVersion=${electron.version} \
-c.mac.identity=null
runHook postBuild
@@ -76,7 +79,7 @@ buildNpmPackage rec {
popd
# Linux needs 'aplay' for notification sounds
makeWrapper '${lib.getExe electron_41}' "$out/bin/teams-for-linux" \
makeWrapper '${lib.getExe electron}' "$out/bin/teams-for-linux" \
--prefix PATH : ${
lib.makeBinPath [
alsa-utils
+6 -3
View File
@@ -16,6 +16,9 @@
nix-update-script,
}:
let
electron = electron_40;
in
buildNpmPackage (finalAttrs: {
pname = "winboat";
version = "0.9.0";
@@ -59,8 +62,8 @@ buildNpmPackage (finalAttrs: {
node scripts/build.ts
npm exec electron-builder --linux -- \
--dir \
-c.electronDist=${electron_40.dist} \
-c.electronVersion=${electron_40.version}
-c.electronDist=${electron.dist} \
-c.electronVersion=${electron.version}
'';
installPhase = ''
@@ -81,7 +84,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_40}/bin/electron $out/bin/winboat \
makeWrapper ${electron}/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 : ${