From 1075a62a0356802d3bfd39d5165fb578de1846d4 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 27 Aug 2024 21:48:44 -0500
Subject: [PATCH] teams-for-linux: move to by-name

---
 .../te/teams-for-linux/package.nix}                       | 8 ++++----
 .../te}/teams-for-linux/update.sh                         | 0
 pkgs/top-level/all-packages.nix                           | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/teams-for-linux/default.nix => by-name/te/teams-for-linux/package.nix} (94%)
 rename pkgs/{applications/networking/instant-messengers => by-name/te}/teams-for-linux/update.sh (100%)

diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/by-name/te/teams-for-linux/package.nix
similarity index 94%
rename from pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
rename to pkgs/by-name/te/teams-for-linux/package.nix
index 4da418eb9d1f..792b25b11562 100644
--- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -9,7 +9,7 @@
   nodejs,
   fetchYarnDeps,
   fixup-yarn-lock,
-  electron,
+  electron_29,
   alsa-utils,
   which,
   testers,
@@ -59,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
       --dir ${if stdenv.isDarwin then "--macos" else "--linux"} ${
         if stdenv.hostPlatform.isAarch64 then "--arm64" else "--x64"
       } \
-      -c.electronDist=${electron.dist} \
-      -c.electronVersion=${electron.version}
+      -c.electronDist=${electron_29.dist} \
+      -c.electronVersion=${electron_29.version}
 
     runHook postBuild
   '';
@@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     popd
 
     # Linux needs 'aplay' for notification sounds
-    makeWrapper '${electron}/bin/electron' "$out/bin/teams-for-linux" \
+    makeWrapper '${electron_29}/bin/electron' "$out/bin/teams-for-linux" \
       ${lib.optionalString stdenv.isLinux ''
         --prefix PATH : ${
           lib.makeBinPath [
diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh b/pkgs/by-name/te/teams-for-linux/update.sh
similarity index 100%
rename from pkgs/applications/networking/instant-messengers/teams-for-linux/update.sh
rename to pkgs/by-name/te/teams-for-linux/update.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8069364dc456..dccff2b34ddd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34633,10 +34633,6 @@ with pkgs;
 
   teams = callPackage ../applications/networking/instant-messengers/teams { };
 
-  teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {
-    electron = electron_29;
-  };
-
   teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };
   teamspeak5_client = callPackage ../applications/networking/instant-messengers/teamspeak/client5.nix { };
   teamspeak_server = callPackage ../applications/networking/instant-messengers/teamspeak/server.nix { };