diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-09-14 12:02:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-14 12:02:14 +0000 |
| commit | 1d1b9bf49abd5e9f98390b07e5b06b2c84d293c9 (patch) | |
| tree | ea077088798df6163043d04b626588c6e6bbb807 | |
| parent | Merge release-21.05 into staging-next-21.05 (diff) | |
| parent | element-desktop: apply patch to run on Wayland (#137666) (diff) | |
| download | nixpkgs-1d1b9bf49abd5e9f98390b07e5b06b2c84d293c9.tar.gz | |
Merge release-21.05 into staging-next-21.05
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/element/element-desktop.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix index 07bf3c8b0f03..d24972f1af3f 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-desktop.nix @@ -1,6 +1,6 @@ { lib, fetchFromGitHub , makeWrapper, makeDesktopItem, mkYarnPackage -, electron, element-web +, electron, element-web, fetchpatch }: # Notes for maintainers: # * versions of `element-web` and `element-desktop` should be kept in sync. @@ -19,6 +19,13 @@ in mkYarnPackage rec { name = "element-desktop-${version}"; 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; yarnNix = ./element-desktop-yarndeps.nix; |