public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge release-21.05 into staging-next-21.05

Browse Source
This commit is contained in:
github-actions[bot] 2021-09-14 12:02:14 +00:00 committed by GitHub
commit 1d1b9bf49a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/instant-messengers/element/element-desktop.nix
View File

@ -1,6 +1,6 @@
{ lib, fetchFromGitHub { lib, fetchFromGitHub
, makeWrapper, makeDesktopItem, mkYarnPackage , makeWrapper, makeDesktopItem, mkYarnPackage
, electron, element-web , electron, element-web, fetchpatch
}: }:
# Notes for maintainers: # Notes for maintainers:
# * versions of `element-web` and `element-desktop` should be kept in sync. # * versions of `element-web` and `element-desktop` should be kept in sync.
@ -19,6 +19,13 @@ in mkYarnPackage rec {
name = "element-desktop-${version}"; name = "element-desktop-${version}";
inherit version src; inherit version src;
patches = [
(fetchpatch {
url = "https://github.com/vector-im/element-desktop/commit/96e5389779f60c91b8fe80d7bd9af413d72ec61f.patch";
sha256 = "sha256-82I5BDNDWIfp+m2HpzTA5+39hMv2bTbmJlXfM4YUjDY=";
})
];
packageJSON = ./element-desktop-package.json; packageJSON = ./element-desktop-package.json;
yarnNix = ./element-desktop-yarndeps.nix; yarnNix = ./element-desktop-yarndeps.nix;