Unverified Commit 6f86e0fa authored by Austin Horstman's avatar Austin Horstman
Browse files

teams-for-linux: move to by-name

parent bea42484
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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 [
+0 −4
Original line number Diff line number Diff line
@@ -33649,10 +33649,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 { };