From cf15a7a0041032a4b9153152377ac8d79b12391b Mon Sep 17 00:00:00 2001 From: Austin Horstman Date: Thu, 10 Apr 2025 17:55:40 -0500 Subject: [PATCH] teams-for-linux: 1.13.1 -> 2.0.7 --- pkgs/by-name/te/teams-for-linux/package.nix | 45 +++++++++++++-------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix index d628e07f892b..eec2a9f6be8c 100644 --- a/pkgs/by-name/te/teams-for-linux/package.nix +++ b/pkgs/by-name/te/teams-for-linux/package.nix @@ -5,26 +5,27 @@ fetchFromGitHub, alsa-utils, copyDesktopItems, - electron_34, + electron_35, makeDesktopItem, makeWrapper, nix-update-script, versionCheckHook, + vulkan-loader, which, }: buildNpmPackage rec { pname = "teams-for-linux"; - version = "1.13.1"; + version = "2.0.7"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = "teams-for-linux"; tag = "v${version}"; - hash = "sha256-0u5UyhRSa4gsLVQLctWMZe/oE8l9jrwCzkPtLWv2xlo="; + hash = "sha256-w7KY7qxsK512YuLw0Ms+kIsuDTou+ZvJ9wPGJx4fbt0="; }; - npmDepsHash = "sha256-BHz1+pd88TDfTXtG0gl5kYiDeG/M94pYdpPtwBrBYzQ="; + npmDepsHash = "sha256-oTS+ylkTf3a0B0pP1aEyxdTR4KL5gk8u+scEWZwyrwg="; nativeBuildInputs = [ makeWrapper @@ -39,21 +40,31 @@ buildNpmPackage rec { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; }; - buildPhase = '' - runHook preBuild + makeCacheWritable = true; - cp -r ${electron_34.dist} electron-dist - chmod -R u+w electron-dist + buildPhase = + '' + runHook preBuild - npm exec electron-builder -- \ - --dir \ - -c.npmRebuild=true \ - -c.asarUnpack="**/*.node" \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron_34.version} + cp -r ${electron_35.dist} electron-dist + chmod -R u+w electron-dist + '' + # Electron builder complains about symlink in electron-dist + + lib.optionalString stdenv.hostPlatform.isLinux '' + rm electron-dist/libvulkan.so.1 + cp ${lib.getLib vulkan-loader}/lib/libvulkan.so.1 electron-dist + '' + + '' - runHook postBuild - ''; + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=true \ + -c.asarUnpack="**/*.node" \ + -c.electronDist=electron-dist \ + -c.electronVersion=${electron_35.version} + + runHook postBuild + ''; installPhase = '' @@ -72,7 +83,7 @@ buildNpmPackage rec { popd # Linux needs 'aplay' for notification sounds - makeWrapper '${lib.getExe electron_34}' "$out/bin/teams-for-linux" \ + makeWrapper '${lib.getExe electron_35}' "$out/bin/teams-for-linux" \ --prefix PATH : ${ lib.makeBinPath [ alsa-utils