diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-09-13 18:43:04 +0200 |
|---|---|---|
| committer | Yuka <yuka@yuka.dev> | 2021-09-14 10:30:05 +0200 |
| commit | 626ae0eeba644be0c92789cefc488f8a19ba7684 (patch) | |
| tree | 71c3d1498ad9f881f9eecfefe604edfba09ce393 | |
| parent | Merge pull request #137428 from risicle/ris-flask-appbuilder-3.3.2-r21.05 (diff) | |
| download | nixpkgs-626ae0eeba644be0c92789cefc488f8a19ba7684.tar.gz | |
element-desktop: apply patch to run on Wayland (#137666)
See upstream PR#261[1] for further reference. Previously, the
`enable-features`-setting was entirely discarded due to an earlier
regression resulting in an attempt to start `element-desktop` in
Wayland-mode without all necessary components.
Closes #137377
[1] https://github.com/vector-im/element-desktop/pull/261
(cherry picked from commit 5a0d0ec1cf90aae4354a97a2afaff079605ffc82)
| -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; |