Unverified Commit d2a5f168 authored by Lily Foster's avatar Lily Foster Committed by GitHub
Browse files

Merge pull request #273932 from chvp/upd/teams 

teams-for-linux: 1.3.22 -> 1.4.1
parents 3569705c 7a9b7e9e

pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix

+14 −3
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, makeWrapper

, makeDesktopItem

, copyDesktopItems
@@ -19,20 +20,30 @@ 


stdenv.mkDerivation (finalAttrs: {

  pname = "teams-for-linux";

  version = "1.3.22";

  version = "1.4.1";



  src = fetchFromGitHub {

    owner = "IsmaelMartinez";

    repo = "teams-for-linux";

    rev = "v${finalAttrs.version}";

    hash = "sha256-nyhAq06k0nNrGSbD0N1RNwcplYf5vO1BvnvEfNYGG0A=";

    hash = "sha256-1URS9VPqV58p8RUA47j8sdqYqps1Ruo0aqdZXedvPX8=";

  };



  offlineCache = fetchYarnDeps {

    yarnLock = "${finalAttrs.src}/yarn.lock";

    hash = "sha256-ydhJXAvz3k6GwpnSL6brl9xFpb+ooi8Am89TkcE00hc=";

    hash = "sha256-ef+JW5ud9LlRxaCJC2iOT5N7FgZO7IkAABJcMQPvIBA=";

  };



  patches = [

    # remove when IsmaelMartinez/teams-for-linux#1058 is merged

    (fetchpatch {

      name = "teams-for-linux-fix-version.patch";

      url = "https://github.com/IsmaelMartinez/teams-for-linux/commit/1d14947eef35c6a2e0cbdfcce405820f8dd36c68.diff";

      hash = "sha256-kj2jEAqgZ0frUw85hY23mFYFcXz95z/WQSDymsheDfg=";

    })

  ];





  nativeBuildInputs = [ yarn prefetch-yarn-deps nodejs copyDesktopItems makeWrapper ];



  configurePhase = ''

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -35688,7 +35688,7 @@ with pkgs; 
  teams = callPackage ../applications/networking/instant-messengers/teams { };















  teams-for-linux = callPackage ../applications/networking/instant-messengers/teams-for-linux {













    electron = electron_27;













    electron = electron_28;















  };





























  teamspeak_client = libsForQt5.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { };