diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-17 18:01:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 18:01:04 +0000 |
| commit | 5c2b2d5b745887f2b771f34ac834753375cbf78e (patch) | |
| tree | 8050ecc32e6c62a4411d8ae80d34d9c1fa6af187 /pkgs/applications/networking/instant-messengers | |
| parent | bd26da84da2bae7c0d370152273602223b828e23 (diff) | |
| parent | d3bf7abb557ea89bf9a5ba3c700fc020ee4f73f7 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/qq/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index 31db4b979e8af..d0a7bbf2a1a99 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -21,6 +21,7 @@ , autoPatchelfHook , makeShellWrapper , wrapGAppsHook +, commandLineArgs ? "" }: let @@ -83,6 +84,7 @@ stdenv.mkDerivation { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" # Remove bundled libraries diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index a7d12206720e4..906736be49774 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "4.16.7"; + version = "4.16.8"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-+BXuFHXGOgpmAX7wsGLxZxfzvNsntFLtd+Obhb339Yc="; + hash = "sha256-M8wFhuTTEJippgvS93LNRqREV2TGF04ccps5oOmSr+0="; }; patches = [ |