diff options
author | Vladimír Čunát <v@cunat.cz> | 2021-04-14 10:08:25 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2021-04-14 10:08:25 +0200 |
commit | d2eb7a78873aa8e8596b9a9367579ab7792af50c (patch) | |
tree | 7fa2a786b55d69f49fcc54f7959c1f331838864d /pkgs/applications/networking/instant-messengers/signal-desktop | |
parent | 3257feac499fb5bc1a65d589b87e570c948ac451 (diff) | |
parent | 25ae1fd29f81fd4a50d4cdf42292ae58d91336ac (diff) |
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/signal-desktop')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/signal-desktop/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 98ede215e029b..d4a72e657cd34 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,7 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 +, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3, mesa # Runtime dependencies: , systemd, libnotify, libdbusmenu, libpulseaudio # Unfortunately this also overwrites the UI language (not just the spell @@ -73,6 +73,7 @@ in stdenv.mkDerivation rec { libappindicator-gtk3 libnotify libuuid + mesa # for libgbm nspr nss pango |