diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
35 files changed, 371 insertions, 426 deletions
diff --git a/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/pkgs/applications/networking/instant-messengers/alfaview/default.nix index d8c4089eee728..5e1ad5cddbd05 100644 --- a/pkgs/applications/networking/instant-messengers/alfaview/default.nix +++ b/pkgs/applications/networking/instant-messengers/alfaview/default.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation rec { homepage = "https://alfaview.com"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = with maintainers; [ hexchen ]; + maintainers = with maintainers; [ ]; mainProgram = "alfaview"; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/applications/networking/instant-messengers/beeper/default.nix b/pkgs/applications/networking/instant-messengers/beeper/default.nix index 87d1d53c9ddea..4b04be48d11e9 100644 --- a/pkgs/applications/networking/instant-messengers/beeper/default.nix +++ b/pkgs/applications/networking/instant-messengers/beeper/default.nix @@ -11,7 +11,6 @@ let pname = "beeper"; version = "3.106.2"; - name = "${pname}-${version}"; src = fetchurl { url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.106.2-build-240604xwl5q01pr-x86_64.AppImage"; hash = "sha256-WbAWJJzk58UVmRN3RHmU/V6zPiLWAb7m7hns4gmP55M="; @@ -25,7 +24,7 @@ let }; in stdenvNoCC.mkDerivation rec { - inherit name pname version; + inherit pname version; src = appimage; diff --git a/pkgs/applications/networking/instant-messengers/cinny/default.nix b/pkgs/applications/networking/instant-messengers/cinny/default.nix index f3ae1665fe3d9..6b3f5904e9757 100644 --- a/pkgs/applications/networking/instant-messengers/cinny/default.nix +++ b/pkgs/applications/networking/instant-messengers/cinny/default.nix @@ -60,7 +60,7 @@ buildNpmPackage rec { meta = with lib; { description = "Yet another Matrix client for the web"; homepage = "https://cinny.in/"; - maintainers = with maintainers; [ abbe ashkitten ]; + maintainers = with maintainers; [ abbe ]; license = licenses.agpl3Only; platforms = platforms.all; }; diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix index 428715b6f1b7a..b818baa899300 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/applications/networking/instant-messengers/dino/default.nix @@ -23,23 +23,17 @@ , webrtc-audio-processing }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dino"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "dino"; repo = "dino"; - rev = "v${version}"; - sha256 = "sha256-smy/t6wTCnG0kuRFKwyeLENKqOQDhL0fZTtj3BHo6kw="; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-I0ASeEjdXyxhz52QisU0q8mIBTKMfjaspJbxRIyOhD4="; }; - patches = [ - # fixes build failure https://github.com/dino/dino/issues/1576 - # backport of https://github.com/dino/dino/commit/657502955567dd538e56f300e075c7db52e25d74 - ./fix-compile-new-vala-c.diff - ]; - postPatch = '' # don't overwrite manually set version information substituteInPlace CMakeLists.txt \ @@ -92,7 +86,7 @@ stdenv.mkDerivation rec { "-DRTP_ENABLE_VP9=true" "-DVERSION_FOUND=true" "-DVERSION_IS_RELEASE=true" - "-DVERSION_FULL=${version}" + "-DVERSION_FULL=${finalAttrs.version}" "-DXGETTEXT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/xgettext" "-DMSGFMT_EXECUTABLE=${lib.getBin buildPackages.gettext}/bin/msgfmt" "-DGLIB_COMPILE_RESOURCES_EXECUTABLE=${lib.getDev buildPackages.glib}/bin/glib-compile-resources" @@ -133,4 +127,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ qyliss tomfitzhenry ]; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff b/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff deleted file mode 100644 index b8277f32afc9c..0000000000000 --- a/pkgs/applications/networking/instant-messengers/dino/fix-compile-new-vala-c.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi -index bcf12569..b32efd03 100644 ---- a/plugins/gpgme-vala/vapi/gpgme_public.vapi -+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi -@@ -22,9 +22,9 @@ public class Key { - public string issuer_name; - public string chain_id; - public Validity owner_trust; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public SubKey[] subkeys; -- [CCode(array_null_terminated = true)] -+ [CCode(array_length = false, array_null_terminated = true)] - public UserID[] uids; - public KeylistMode keylist_mode; - // public string fpr; // requires gpgme >= 1.7.0 diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 7c0d9c7b1e5a2..6b4af03b5e6b3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -2,52 +2,52 @@ let versions = if stdenv.isLinux then { - stable = "0.0.56"; - ptb = "0.0.90"; - canary = "0.0.431"; - development = "0.0.19"; + stable = "0.0.58"; + ptb = "0.0.92"; + canary = "0.0.438"; + development = "0.0.21"; } else { - stable = "0.0.307"; - ptb = "0.0.119"; - canary = "0.0.531"; - development = "0.0.41"; + stable = "0.0.309"; + ptb = "0.0.121"; + canary = "0.0.547"; + development = "0.0.43"; }; version = versions.${branch}; srcs = rec { x86_64-linux = { stable = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - hash = "sha256-HpdsvzWtB4AoqZXf7LV0J50/OQDsYgK8bkQ1HGvu7Ec="; + hash = "sha256-YkyniFgkD4GMxUya+/Ke5fxosZKHKyc4+cAx3HI4w8c="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - hash = "sha256-75YnLhgNTd7pwpTE9qSIF0rzBwmGJ/CYa+YgN3OQZ2w="; + hash = "sha256-1HbTRWl1w9cu7D4NNFGVbHk1hvRmMywH+q2qA4+nokc="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - hash = "sha256-59Sv3U3osfk+QoXgorpqK7CU0nJBdpFOMkoGRgHN3v8="; + hash = "sha256-z2SsI1vmaW1HjBDkJEH468xPuyAqigOIbRDtaL4Lgxc="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/linux/${version}/discord-development-${version}.tar.gz"; - hash = "sha256-RP6SUM4DW3JhddSbJX6Xg8EE4iqCkSOgBL1oa7Zwp/E="; + hash = "sha256-LgRrQ2z0/mx9Xvkb7hOrhmOqaETiBITgJDO9vce/wtk="; }; }; x86_64-darwin = { stable = fetchurl { url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - hash = "sha256-FBYxQhtwctMQ8ByOgAVncWh5297k1Vh95w/rWnZg9Fw="; + hash = "sha256-9Tfn+dxvhgNjSdfj8Irb/5VU3kn39DX6hdKkppJ6HeU="; }; ptb = fetchurl { url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - hash = "sha256-Y5t6ndecfRf3zVfYEvFGiFinQxRSa7VyfnkAors8VPY="; + hash = "sha256-3Lk+kPZcBqznIELVMdA6dRpCOaOuRrchmfHv/EAyyOQ="; }; canary = fetchurl { url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; - hash = "sha256-eMJ/OKi+k92QEk140UW3RIi5G/UFlR6mW9f8kPZbFaw="; + hash = "sha256-ec2XF3023bQn/85i1xO8tTuYuprtsaL9exqRiZam36A="; }; development = fetchurl { url = "https://dl-development.discordapp.net/apps/osx/${version}/DiscordDevelopment.dmg"; - hash = "sha256-RiGyca/zjPpENgcq9KnRh5G4YArrUOQeueUdUBgZgjo="; + hash = "sha256-PZS7LHJExi+fb7G4CnIFk4KQx9/cL4ALXwzOcLx4sWU="; }; }; aarch64-darwin = x86_64-darwin; diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index 66d7abc0822d0..5d49787837855 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -7,7 +7,7 @@ , flutter319 , pulseaudio , makeDesktopItem -, gnome +, zenity , targetFlutterPlatform ? "linux" }: @@ -50,7 +50,7 @@ flutter319.buildFlutterApplication (rec { runtimeDependencies = [ pulseaudio ]; - extraWrapProgramArgs = "--prefix PATH : ${gnome.zenity}/bin"; + extraWrapProgramArgs = "--prefix PATH : ${zenity}/bin"; env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7f273359de4e7..ef57fe10ac815 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,7 +1,7 @@ { lib, fetchurl, gettext, wrapGAppsHook3 # Native dependencies -, python3, gtk3, gobject-introspection, gnome +, python3, gtk3, gobject-introspection, adwaita-icon-theme , gtksourceview4 , glib-networking @@ -31,7 +31,8 @@ python3.pkgs.buildPythonApplication rec { format = "pyproject"; buildInputs = [ - gtk3 gnome.adwaita-icon-theme + gtk3 + adwaita-icon-theme gtksourceview4 glib-networking ] ++ lib.optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-good libnice ] diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix index 8a1052d04df4f..8390d77934585 100644 --- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix @@ -8,17 +8,17 @@ let pname = "mattermost-desktop"; - version = "5.7.0"; + version = "5.8.1"; srcs = { "x86_64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-x64.tar.gz"; - hash = "sha256-1xfU9+VzjhSVWsP1AYizphhQ2010GbQBgQ4dxvY3TBU="; + hash = "sha256-VuYHF5ALdbsKxBI7w5UhcqKYLV8BHZncWSDeuCy/SW0="; }; "aarch64-linux" = { url = "https://releases.mattermost.com/desktop/${version}/${pname}-${version}-linux-arm64.tar.gz"; - hash = "sha256-RrH+R9IuokKK+zfmCmOt38hD1HvWJbKqmxTFhQ3RcqQ="; + hash = "sha256-b+sVzMX/NDavshR+WsQyVgYyLkIPSuUlZGqK6/ZjLFs="; }; }; diff --git a/pkgs/applications/networking/instant-messengers/neosay/default.nix b/pkgs/applications/networking/instant-messengers/neosay/default.nix index 46ea22da5db81..b6fbbd68401f1 100644 --- a/pkgs/applications/networking/instant-messengers/neosay/default.nix +++ b/pkgs/applications/networking/instant-messengers/neosay/default.nix @@ -23,6 +23,6 @@ buildGoModule rec { mainProgram = "neosay"; homepage = "https://github.com/donuts-are-good/neosay"; license = licenses.mit; - maintainers = with maintainers; [ janik ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index f12a51d751913..f5118bb968634 100644 --- a/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -24,7 +24,6 @@ python3Packages.buildPythonApplication rec { installShellFiles ] ++ (with python3Packages; [ setuptools - pythonRelaxDepsHook ]); pythonRelaxDeps = [ diff --git a/pkgs/applications/networking/instant-messengers/qq/default.nix b/pkgs/applications/networking/instant-messengers/qq/default.nix index cbb23559ae61f..0167146e57853 100644 --- a/pkgs/applications/networking/instant-messengers/qq/default.nix +++ b/pkgs/applications/networking/instant-messengers/qq/default.nix @@ -1,4 +1,5 @@ { alsa-lib +, libuuid , cups , dpkg , fetchurl @@ -86,7 +87,7 @@ stdenv.mkDerivation { makeShellWrapper $out/opt/QQ/qq $out/bin/qq \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --prefix LD_PRELOAD : "${lib.makeLibraryPath [ libssh2 ]}/libssh2.so.1" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL libuuid]}" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ --add-flags ${lib.escapeShellArg commandLineArgs} \ "''${gappsWrapperArgs[@]}" @@ -115,6 +116,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" ]; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ fee1-dead ]; + maintainers = with lib.maintainers; [ fee1-dead bot-wxt1221 ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/qq/sources.nix b/pkgs/applications/networking/instant-messengers/qq/sources.nix index 4fa23026a9571..a63a416a8bf03 100644 --- a/pkgs/applications/networking/instant-messengers/qq/sources.nix +++ b/pkgs/applications/networking/instant-messengers/qq/sources.nix @@ -1,9 +1,9 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2024-06-07 +# Last updated: 2024-06-17 { - version = "3.2.9"; - amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_amd64_01.deb"; - arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.9_240606_arm64_01.deb"; - arm64_hash = "sha256-wZyaIkJdGDvIw8PrRlOiKpo3rdeELlxYBPyS6llbL4w="; - amd64_hash = "sha256-DcQWwep4p4aWUAoBNQ9Ge1QBiCxk6BhcziTDSHmRpgY="; + version = "3.2.10"; + amd64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/944f8942/linuxqq_3.2.10-25234_amd64.deb"; + arm64_url = "https://dldir1.qq.com/qqfile/qq/QQNT/944f8942/linuxqq_3.2.10-25234_arm64.deb"; + arm64_hash = "sha256-UY9UFbwQjXBd0+52iron1LZQWP/ncUZwylrtDzm5lW8="; + amd64_hash = "sha256-CHVX5tBV/w//At2wBjLqgTzayi4NI5i06IDgyW++ha4="; } diff --git a/pkgs/applications/networking/instant-messengers/ripcord/default.nix b/pkgs/applications/networking/instant-messengers/ripcord/default.nix index 82d1fdff2e808..7e40f880d2761 100644 --- a/pkgs/applications/networking/instant-messengers/ripcord/default.nix +++ b/pkgs/applications/networking/instant-messengers/ripcord/default.nix @@ -14,7 +14,7 @@ mkDerivation rec { name = "${pname}-${version}.AppImage"; }; in appimageTools.extract { - name = "${pname}-${version}"; + inherit pname version; src = appimage; }; diff --git a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix index 93fb435f3909a..6db3418789b2c 100644 --- a/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/rocketchat-desktop/default.nix @@ -4,11 +4,11 @@ let in stdenv.mkDerivation rec { pname = "rocketchat-desktop"; - version = "3.9.15"; + version = "4.0.0"; src = fetchurl { url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; - hash = "sha256-fMnr7RCNoYVyV+CzKOIqaGd6T6+3fJxMuPjNdFAZdX0="; + hash = "sha256-ryfYaePwL4W6x8sKlxACadLUvXEqyqJ0enlSnmVmpUo="; }; nativeBuildInputs = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { atk pango freetype - libgnome-keyring3 + libgnome-keyring fontconfig gdk-pixbuf cairo diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a6855b2539dd6..808fc19418220 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.13.3"; + version = "0.13.4"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - hash = "sha256-JNDl/esJdY+L+CGCAauPSeUID5eAaKChHqMf+jl4HuQ="; + hash = "sha256-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 8621aaf1b3eab..d6a543b77adbc 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.14.0-beta.1"; + version = "7.15.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-SC7CCqylPkc/qmlSYlXJcVWGi1+hvRQ9qBGR6wqo6sk="; + hash = "sha256-RnaYRd7hKTazh0dEX3wv0fFsdbYv0aqNJtswv8/f+YU="; } diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index c4f59cd3dd557..fcd1e22cf40c1 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.13.0"; + version = "7.14.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-lwo5O8UAjjMuaeM8J804oN+y72uYZBL+eP/NwpnD4H0="; + hash = "sha256-nRvGpAKRIPgXStrVu4qSMoW01SACV/wW/c05lLncCW8="; } diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 6f241957b552d..39f05b615e36e 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "signalbackup-tools"; - version = "20240625"; + version = "20240702-2"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-sEuSVyfbHqljXz0mHX0loIkw/OCwcBXE/iGD+55GRng="; + hash = "sha256-nPNhN4ODCZMii5VATcvh8qvdrQQ0r94X6vlaYgtQFac="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 99ff0b412e2cd..ea3f0b672939d 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, dpkg -, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome +, alsa-lib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome-keyring , gtk3, libappindicator-gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook3, xorg , at-spi2-atk, libuuid, at-spi2-core, libdrm, mesa, libxkbcommon, libxshmfence }: @@ -30,7 +30,7 @@ let gtk3 libappindicator-gtk3 - gnome.gnome-keyring + gnome-keyring libnotify libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index f59b9c3774bc6..b5ac402921d2a 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "teams-for-linux"; homepage = "https://github.com/IsmaelMartinez/teams-for-linux"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ muscaln lilyinstarlight qjoly chvp ]; + maintainers = with lib.maintainers; [ muscaln qjoly chvp ]; platforms = lib.platforms.unix; broken = stdenv.isDarwin; }; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix index 86136dbb36d6a..e577aa110fc94 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client5.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { libnotify libpulseaudio libxkbcommon - mesa.drivers nss xorg.libX11 xorg.libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f0732ec039208..aaabf518b959d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -6,17 +6,18 @@ , cmake , ninja , clang +, lld , python3 , wrapQtAppsHook , removeReferencesTo -, extra-cmake-modules , qtbase , qtimageformats , qtsvg -, kwayland +, qtwayland +, kcoreaddons , lz4 , xxHash -, ffmpeg_4 +, ffmpeg , openalSoft , minizip , libopus @@ -25,94 +26,59 @@ , range-v3 , tl-expected , hunspell -, glibmm +, gobject-introspection +, glibmm_2_68 , jemalloc , rnnoise , abseil-cpp , microsoft-gsl +, boost +, fmt , wayland , libicns -, Cocoa -, CoreFoundation -, CoreServices -, CoreText -, CoreGraphics -, CoreMedia -, OpenGL -, AudioUnit -, ApplicationServices -, Foundation -, AGL -, Security -, SystemConfiguration -, Carbon -, AudioToolbox -, VideoToolbox -, VideoDecodeAcceleration -, AVFoundation -, CoreAudio -, CoreVideo -, CoreMediaIO -, QuartzCore -, AppKit -, CoreWLAN -, WebKit -, IOKit -, GSS -, MediaPlayer -, IOSurface -, Metal -, MetalKit +, darwin }: let tg_owt = callPackage ./tg_owt.nix { - abseil-cpp = abseil-cpp.override { - # abseil-cpp should use the same compiler - inherit stdenv; - cxxStandard = "20"; - }; - # tg_owt should use the same compiler inherit stdenv; - - inherit Cocoa AppKit IOKit IOSurface Foundation AVFoundation CoreMedia VideoToolbox - CoreGraphics CoreVideo OpenGL Metal MetalKit CoreFoundation ApplicationServices; }; + + mainProgram = if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"; in stdenv.mkDerivation rec { pname = "kotatogram-desktop"; - version = "1.4.9"; + version = "0-unstable-2024-07-01"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "k${version}"; - sha256 = "sha256-6bF/6fr8mJyyVg53qUykysL7chuewtJB8E22kVyxjHw="; + rev = "fbb22ebd3e39dfa4a036fa79a7a3f78b86b1cea2"; + sha256 = "sha256-ccfmaqapk9ct+5kvBI02xHJ7YCGmm1CcqwM+3hC1bk0="; fetchSubmodules = true; }; patches = [ - ./kf594.patch - ./shortcuts-binary-path.patch + ./macos.patch + ./macos-opengl.patch ]; postPatch = lib.optionalString stdenv.isLinux '' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' + --replace-fail '"libasound.so.2"' '"${alsa-lib}/lib/libasound.so.2"' substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' + --replace-fail '"libpulse.so.0"' '"${libpulseaudio}/lib/libpulse.so.0"' '' + lib.optionalString stdenv.isDarwin '' - sed -i "13i#import <CoreAudio/CoreAudio.h>" Telegram/lib_webrtc/webrtc/mac/webrtc_media_devices_mac.mm - substituteInPlace Telegram/CMakeLists.txt \ - --replace 'COMMAND iconutil' 'COMMAND png2icns' \ - --replace '--convert icns' "" \ - --replace '--output AppIcon.icns' 'AppIcon.icns' \ - --replace "\''${appicon_path}" "\''${appicon_path}/icon_16x16.png \''${appicon_path}/icon_32x32.png \''${appicon_path}/icon_128x128.png \''${appicon_path}/icon_256x256.png \''${appicon_path}/icon_512x512.png" + substituteInPlace Telegram/lib_webrtc/webrtc/platform/mac/webrtc_environment_mac.mm \ + --replace-fail kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster ''; + # Wrapping the inside of the app bundles, avoiding double-wrapping + dontWrapQtApps = stdenv.isDarwin; + nativeBuildInputs = [ pkg-config cmake @@ -123,7 +89,9 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isLinux [ # to build bundled libdispatch clang - extra-cmake-modules + gobject-introspection + ] ++ lib.optionals stdenv.isDarwin [ + lld ]; buildInputs = [ @@ -132,7 +100,7 @@ stdenv.mkDerivation rec { qtsvg lz4 xxHash - ffmpeg_4 + ffmpeg openalSoft minizip libopus @@ -141,15 +109,18 @@ stdenv.mkDerivation rec { rnnoise tg_owt microsoft-gsl + boost ] ++ lib.optionals stdenv.isLinux [ - kwayland + qtwayland + kcoreaddons alsa-lib libpulseaudio hunspell - glibmm + glibmm_2_68 jemalloc + fmt wayland - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ Cocoa CoreFoundation CoreServices @@ -180,27 +151,34 @@ stdenv.mkDerivation rec { MediaPlayer IOSurface Metal + NaturalLanguage libicns - ]; + ]); enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.isDarwin { + NIX_CFLAGS_LINK = "-fuse-ld=lld"; + }; + cmakeFlags = [ "-DTDESKTOP_API_TEST=ON" - "-DDESKTOP_APP_QT6=OFF" ]; installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r Kotatogram.app $out/Applications - ln -s $out/Applications/Kotatogram.app/Contents/MacOS $out/bin + cp -r ${mainProgram}.app $out/Applications + ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} ''; preFixup = '' - binName=${if stdenv.isLinux then "kotatogram-desktop" else "Kotatogram"} - remove-references-to -t ${stdenv.cc.cc} $out/bin/$binName - remove-references-to -t ${microsoft-gsl} $out/bin/$binName - remove-references-to -t ${tg_owt.dev} $out/bin/$binName + remove-references-to -t ${stdenv.cc.cc} $out/bin/${mainProgram} + remove-references-to -t ${microsoft-gsl} $out/bin/${mainProgram} + remove-references-to -t ${tg_owt.dev} $out/bin/${mainProgram} + ''; + + postFixup = lib.optionalString stdenv.isDarwin '' + wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} ''; passthru = { @@ -208,8 +186,8 @@ stdenv.mkDerivation rec { }; meta = with lib; { + inherit mainProgram; description = "Kotatogram – experimental Telegram Desktop fork"; - mainProgram = "kotatogram-desktop"; longDescription = '' Unofficial desktop client for the Telegram messenger, based on Telegram Desktop. @@ -220,7 +198,5 @@ stdenv.mkDerivation rec { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}"; maintainers = with maintainers; [ ilya-fedin ]; - # never built on aarch64-darwin since first introduction in nixpkgs - broken = stdenv.isDarwin && stdenv.isAarch64; }; } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch deleted file mode 100644 index 0fa2d8bc8f6ee..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -index 7641579aa..3c195e397 100644 ---- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -+++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp -@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - - #include "base/platform/base_platform_info.h" - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <plasmashell.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/plasmashell.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -index 32f0de6..30a087f 100644 ---- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -+++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp -@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <QtCore/QPointer> - #include <QtGui/QWindow> - --#include <connection_thread.h> --#include <registry.h> --#include <surface.h> --#include <xdgforeign.h> --#include <idleinhibit.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> -+#include <KWayland/Client/surface.h> -+#include <KWayland/Client/xdgforeign.h> -+#include <KWayland/Client/idleinhibit.h> - - using namespace KWayland::Client; - -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -index 01f1e80..163cb6a 100644 ---- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -+++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp -@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include <private/qwaylandwindow_p.h> - #include <private/qwaylandshellsurface_p.h> - --#include <connection_thread.h> --#include <registry.h> -+#include <KWayland/Client/connection_thread.h> -+#include <KWayland/Client/registry.h> - - Q_DECLARE_METATYPE(QMargins); - diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch new file mode 100644 index 0000000000000..e81bd53b440ce --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-opengl.patch @@ -0,0 +1,66 @@ +diff --git a/Telegram/SourceFiles/media/view/media_view_pip.cpp b/Telegram/SourceFiles/media/view/media_view_pip.cpp +index 655e7cf410..c356acbffe 100644 +--- a/Telegram/SourceFiles/media/view/media_view_pip.cpp ++++ b/Telegram/SourceFiles/media/view/media_view_pip.cpp +@@ -1333,7 +1333,7 @@ void Pip::setupStreaming() { + Ui::GL::ChosenRenderer Pip::chooseRenderer( + Ui::GL::Capabilities capabilities) { + const auto use = Platform::IsMac() +- ? true ++ ? false + : capabilities.transparency; + LOG(("OpenGL: %1 (PipPanel)").arg(Logs::b(use))); + if (use) { +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/gl/gl_detection.cpp b/Telegram/lib_ui/ui/gl/gl_detection.cpp +index 150eb8b..c7ce9f9 100644 +--- a/Telegram/lib_ui/ui/gl/gl_detection.cpp ++++ b/Telegram/lib_ui/ui/gl/gl_detection.cpp +@@ -236,7 +236,7 @@ Capabilities CheckCapabilities(QWidget *widget, bool avoidWidgetCreation) { + + Backend ChooseBackendDefault(Capabilities capabilities) { + const auto use = ::Platform::IsMac() +- ? true ++ ? false + : ::Platform::IsWindows() + ? capabilities.supported + : capabilities.transparency; +diff --git a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +index 7b29363..22c4fb3 100644 +--- a/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm ++++ b/Telegram/lib_ui/ui/platform/mac/ui_window_mac.mm +@@ -16,7 +16,6 @@ + #include <QtCore/QAbstractNativeEventFilter> + #include <QtGui/QWindow> + #include <QtGui/QtEvents> +-#include <QOpenGLWidget> + #include <Cocoa/Cocoa.h> + + @interface WindowObserver : NSObject { +@@ -138,7 +137,6 @@ public: + + private: + void init(); +- void initOpenGL(); + void resolveWeakPointers(); + void revalidateWeakPointers() const; + void initCustomTitle(); +@@ -272,10 +270,6 @@ void WindowHelper::Private::enforceStyle() { + } + } + +-void WindowHelper::Private::initOpenGL() { +- auto forceOpenGL = std::make_unique<QOpenGLWidget>(_owner->window()); +-} +- + void WindowHelper::Private::resolveWeakPointers() { + if (!_owner->window()->winId()) { + _owner->window()->createWinId(); +@@ -338,7 +332,6 @@ void WindowHelper::Private::initCustomTitle() { + } + + void WindowHelper::Private::init() { +- initOpenGL(); + resolveWeakPointers(); + initCustomTitle(); + } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch new file mode 100644 index 0000000000000..8082f09646052 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos.patch @@ -0,0 +1,52 @@ +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +index 7ce90d3..dac3c2c 100644 +--- a/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm ++++ b/Telegram/lib_base/base/platform/mac/base_battery_saving_mac.mm +@@ -138,6 +138,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + _observer = [[LowPowerModeObserver alloc] initWithCallback:std::move(wrapped)]; + + NSNotificationCenter *center = [NSNotificationCenter defaultCenter]; ++#if 0 + if (@available(macOS 12.0, *)) { + [center + addObserver: _observer +@@ -145,6 +146,7 @@ BatterySaving::BatterySaving(Fn<void()> changedCallback) { + name: NSProcessInfoPowerStateDidChangeNotification + object: nil]; + } ++#endif + [center + addObserver: _observer + selector: @selector(powerStateChanged:) +@@ -178,11 +180,13 @@ std::optional<bool> BatterySaving::enabled() const { + return std::nullopt; + } + NSProcessInfo *info = [NSProcessInfo processInfo]; ++#if 0 + if (@available(macOS 12.0, *)) { + if ([info isLowPowerModeEnabled]) { + return true; + } + } ++#endif + const auto state = DetectBatteryState(); + if (!state.has || !state.draining) { + return false; +Submodule Telegram/lib_webview contains modified content +diff --git a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +index 657c5a4..4bfc097 100644 +--- a/Telegram/lib_webview/webview/platform/mac/webview_mac.mm ++++ b/Telegram/lib_webview/webview/platform/mac/webview_mac.mm +@@ -317,9 +317,11 @@ Instance::Instance(Config config) { + _dataRequestHandler = std::move(config.dataRequestHandler); + [configuration setURLSchemeHandler:_handler forURLScheme:stdToNS(kDataUrlScheme)]; + _webview = [[WKWebView alloc] initWithFrame:NSZeroRect configuration:configuration]; ++#if 0 + if (@available(macOS 13.3, *)) { + _webview.inspectable = config.debug ? YES : NO; + } ++#endif + [_manager addScriptMessageHandler:_handler name:@"external"]; + [_webview setNavigationDelegate:_handler]; + [_webview setUIDelegate:_handler]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch deleted file mode 100644 index f173a64f141a0..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/shortcuts-binary-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp -index 2a092c6ea..de46dd269 100644 ---- a/Telegram/SourceFiles/core/application.cpp -+++ b/Telegram/SourceFiles/core/application.cpp -@@ -1173,7 +1173,7 @@ void Application::startShortcuts() { - - void Application::RegisterUrlScheme() { - base::Platform::RegisterUrlScheme(base::Platform::UrlSchemeDescriptor{ -- .executable = cExeDir() + cExeName(), -+ .executable = qsl("kotatogram-desktop"), - .arguments = qsl("-workdir \"%1\"").arg(cWorkingDir()), - .protocol = qsl("tg"), - .protocolName = qsl("Telegram Link"), -diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 26168baa7..00d2525a0 100644 ---- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp -+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -303,19 +303,11 @@ bool GenerateDesktopFile( - - QFile target(targetFile); - if (target.open(QIODevice::WriteOnly)) { -- fileText = fileText.replace( -- QRegularExpression( -- qsl("^TryExec=.*$"), -- QRegularExpression::MultilineOption), -- qsl("TryExec=%1").arg( -- QString(cExeDir() + cExeName()).replace('\\', "\\\\"))); -- - fileText = fileText.replace( - QRegularExpression( - qsl("^Exec=kotatogram-desktop(.*)$"), - QRegularExpression::MultilineOption), -- qsl("Exec=%1 -workdir %2\\1").arg( -- EscapeShellInLauncher(cExeDir() + cExeName()), -+ qsl("Exec=kotatogram-desktop -workdir %1\\1").arg( - EscapeShellInLauncher(cWorkingDir()))); - - fileText = fileText.replace( diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix index 694021d0f7fe2..e2f3c4ba884ed 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , cmake , ninja @@ -9,10 +8,10 @@ , libjpeg , openssl , libopus -, ffmpeg_4 +, ffmpeg , protobuf , openh264 -, usrsctp +, crc32c , libvpx , libX11 , libXtst @@ -28,65 +27,23 @@ , mesa , libdrm , libGL -, Cocoa -, AppKit -, IOKit -, IOSurface -, Foundation -, AVFoundation -, CoreMedia -, VideoToolbox -, CoreGraphics -, CoreVideo -, OpenGL -, Metal -, MetalKit -, CoreFoundation -, ApplicationServices +, darwin }: -let - libsrtp = fetchFromGitHub { - owner = "cisco"; - repo = "libsrtp"; - - # https://github.com/desktop-app/tg_owt/commit/6894e86eef8809d42b66eb85e376006f2a816a56 - rev = "a566a9cfcd619e8327784aa7cff4a1276dc1e895"; - sha256 = "sha256-OvCw7oF1OuamP3qO2BsimeBSHq1rcXFLfK8KnbbgkMU="; - }; -in - stdenv.mkDerivation { pname = "tg_owt"; - version = "unstable-2022-04-13"; + version = "0-unstable-2024-06-15"; src = fetchFromGitHub { owner = "desktop-app"; repo = "tg_owt"; - rev = "63a934db1ed212ebf8aaaa20f0010dd7b0d7b396"; - sha256 = "sha256-WddSsQ9KW1zYyYckzdUOvfFZArYAbyvXmABQNMtK6cM="; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + sha256 = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; fetchSubmodules = true; }; - patches = [ - ./tg_owt.patch - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/0614aac699b1a53242ffe2664e3724533bf64f97.patch"; - hash = "sha256-iCdX518CB/RboDFhl3opnwcAgtqpNWZzYtV75Q+WB6Y="; - }) - - (fetchpatch { - url = "https://github.com/desktop-app/tg_owt/commit/9d120195334db4f232c925529aa7601656dc59d7.patch"; - hash = "sha256-k99OBCdE2eQVyXEyvreEqVtzC8Xfdolbgd1Z7lV2ceE="; - }) - ]; - - postPatch = '' - rm -r src/third_party/libsrtp - cp -r --no-preserve=mode ${libsrtp} src/third_party/libsrtp - '' + lib.optionalString stdenv.isLinux '' - substituteInPlace src/modules/desktop_capture/linux/egl_dmabuf.cc \ + postPatch = lib.optionalString stdenv.isLinux '' + substituteInPlace src/modules/desktop_capture/linux/wayland/egl_dmabuf.cc \ --replace '"libEGL.so.1"' '"${libGL}/lib/libEGL.so.1"' \ --replace '"libGL.so.1"' '"${libGL}/lib/libGL.so.1"' \ --replace '"libgbm.so.1"' '"${mesa}/lib/libgbm.so.1"' \ @@ -101,10 +58,10 @@ stdenv.mkDerivation { libjpeg openssl libopus - ffmpeg_4 + ffmpeg protobuf openh264 - usrsctp + crc32c libvpx abseil-cpp ] ++ lib.optionals stdenv.isLinux [ @@ -121,7 +78,7 @@ stdenv.mkDerivation { mesa libdrm libGL - ] ++ lib.optionals stdenv.isDarwin [ + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Cocoa AppKit IOKit @@ -137,7 +94,7 @@ stdenv.mkDerivation { MetalKit CoreFoundation ApplicationServices - ]; + ]); enableParallelBuilding = true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch deleted file mode 100644 index be7d696fc84d3..0000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/src/modules/include/module_common_types_public.h -+++ b/src/modules/include/module_common_types_public.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_ - -+#include <cstdint> - #include <limits> - - #include "absl/types/optional.h" -diff --git a/src/common_video/h265/h265_pps_parser.h b/src/common_video/h265/h265_pps_parser.h -index 28c95ea9..790b0b73 100644 ---- a/src/common_video/h265/h265_pps_parser.h -+++ b/src/common_video/h265/h265_pps_parser.h -@@ -13,6 +13,8 @@ - - #include "absl/types/optional.h" - -+#include <stdint.h> -+ - namespace rtc { - class BitBuffer; - } ---- a/src/rtc_base/third_party/base64/base64.h -+++ b/src/rtc_base/third_party/base64/base64.h -@@ -11,6 +11,7 @@ - #ifndef RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - #define RTC_BASE_THIRD_PARTY_BASE64_BASE64_H_ - -+#include <cstdint> - #include <string> - #include <vector> - ---- a/src/modules/audio_processing/transient/file_utils.h -+++ b/src/modules/audio_processing/transient/file_utils.h -@@ -11,6 +11,7 @@ - #ifndef MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - #define MODULES_AUDIO_PROCESSING_TRANSIENT_FILE_UTILS_H_ - -+#include <stdint.h> - #include <string.h> - - #include "rtc_base/system/file_wrapper.h" diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix index 73c71d294c848..f41713389679b 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/with-webkit.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk, makeWrapper }: +{ stdenv, lib, kotatogram-desktop, glib-networking, webkitgtk_6_0, makeWrapper }: stdenv.mkDerivation { pname = "${kotatogram-desktop.pname}-with-webkit"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/bin makeWrapper ${kotatogram-desktop}/bin/kotatogram-desktop $out/bin/kotatogram-desktop \ --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ webkitgtk_6_0 ]} ''; meta = kotatogram-desktop.meta // { platforms = lib.platforms.linux; 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 27617f930fae5..26a9813441b75 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , callPackage , pkg-config , cmake @@ -60,18 +59,17 @@ let cxxStandard = "20"; }; }; - mainProgram = if stdenv.isLinux then "telegram-desktop" else "Telegram"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.1.8"; + version = "5.2.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-YTCvniC8THoz0BUM/gkr97rhbbSVQ+SCE1H3qS68lIM="; + hash = "sha256-rvd4Ei4MpWiilHCV291UrJkHaUcwth9AWc3PSqjj+EI="; }; patches = [ @@ -79,10 +77,7 @@ stdenv.mkDerivation rec { # the generated .desktop files contains references to unwrapped tdesktop, breaking scheme handling # and the scheme handler is already registered in the packaged .desktop file, rendering this unnecessary # see https://github.com/NixOS/nixpkgs/issues/218370 - (fetchpatch { - url = "https://salsa.debian.org/debian/telegram-desktop/-/raw/09b363ed5a4fcd8ecc3282b9bfede5fbb83f97ef/debian/patches/Disable-register-custom-scheme.patch"; - hash = "sha256-B8X5lnSpwwdp1HlvyXJWQPybEN+plOwimdV5gW6aY2Y="; - }) + ./scheme.patch ]; postPatch = lib.optionalString stdenv.isLinux '' @@ -179,6 +174,7 @@ stdenv.mkDerivation rec { IOSurface Metal NaturalLanguage + LocalAuthentication libicns ]); @@ -203,19 +199,19 @@ stdenv.mkDerivation rec { installPhase = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications - cp -r ${mainProgram}.app $out/Applications - ln -s $out/{Applications/${mainProgram}.app/Contents/MacOS,bin} + cp -r ${finalAttrs.meta.mainProgram}.app $out/Applications + ln -s $out/{Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS,bin} ''; postFixup = lib.optionalString stdenv.isLinux '' # This is necessary to run Telegram in a pure environment. # We also use gappsWrapperArgs from wrapGAppsHook. - wrapProgram $out/bin/${mainProgram} \ + wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ "''${gappsWrapperArgs[@]}" \ "''${qtWrapperArgs[@]}" \ --suffix PATH : ${lib.makeBinPath [ xdg-utils ]} '' + lib.optionalString stdenv.isDarwin '' - wrapQtApp $out/Applications/${mainProgram}.app/Contents/MacOS/${mainProgram} + wrapQtApp $out/Applications/${finalAttrs.meta.mainProgram}.app/Contents/MacOS/${finalAttrs.meta.mainProgram} ''; passthru = { @@ -234,6 +230,6 @@ stdenv.mkDerivation rec { homepage = "https://desktop.telegram.org/"; changelog = "https://github.com/telegramdesktop/tdesktop/releases/tag/v${version}"; maintainers = with maintainers; [ nickcao ]; - inherit mainProgram; + mainProgram = if stdenv.hostPlatform.isLinux then "telegram-desktop" else "Telegram"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch new file mode 100644 index 0000000000000..58aaa8a7fcb54 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/scheme.patch @@ -0,0 +1,12 @@ +diff --git a/Telegram/SourceFiles/core/application.cpp b/Telegram/SourceFiles/core/application.cpp +index e3e0de6c6..d5851bd6e 100644 +--- a/Telegram/SourceFiles/core/application.cpp ++++ b/Telegram/SourceFiles/core/application.cpp +@@ -421,7 +421,6 @@ void Application::run() { + + void Application::autoRegisterUrlScheme() { + if (!OptionSkipUrlSchemeRegister.value()) { +- InvokeQueued(this, [] { RegisterUrlScheme(); }); + } + } + diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix index f6145678d38f1..29a1fc8ede8d8 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "twitch-tui"; - version = "2.6.12"; + version = "2.6.13"; src = fetchFromGitHub { owner = "Xithrius"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-mEpeuopMzZhWOAikEP7Er8xcgNkGbCTkJJYrQr7GrBQ="; + hash = "sha256-VEcBPiekjiDjXYTz/gqjES8N77GgwPdWRUJJ3twLmgU="; }; - cargoHash = "sha256-U9L4SrYTAUcQ9/2f8tD7jxByVQS9P6OXpra6QvbhNNg="; + cargoHash = "sha256-uhm6Z4oJ8w1tN3VDtCNF2/pixNLCXnaEg8yyUSTJRnM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index 781508179cbfe..65f16353014d4 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,17 +1,54 @@ -{fetchurl, lib, stdenv, dpkg, makeWrapper, - alsa-lib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, - harfbuzz, libcap, libGL, libGLU, libpulseaudio, libxkbcommon, libxml2, libxslt, - nspr, nss, openssl_1_1, systemd, wayland, xorg, zlib, ... +{ + fetchurl, + lib, + stdenv, + dpkg, + makeWrapper, + alsa-lib, + brotli, + cups, + curl, + dbus, + expat, + fontconfig, + freetype, + glib, + gst_all_1, + harfbuzz, + lcms, + libcap, + libevent, + libGL, + libGLU, + libkrb5, + libopus, + libpulseaudio, + libxkbcommon, + libxkbfile, + libxml2, + libxslt, + libwebp, + mesa, + nspr, + nss, + openssl, + snappy, + systemd, + wayland, + xorg, + zlib, + zstd, + ... }: stdenv.mkDerivation { pname = "viber"; - version = "16.1.0.37"; + version = "21.8.0.11"; src = fetchurl { # Official link: https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb - url = "https://web.archive.org/web/20211119123858/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; - sha256 = "sha256-hOz+EQc2OOlLTPa2kOefPJMUyWvSvrgqgPgBKjWE3p8="; + url = "https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb"; + hash = "sha256-RrObmN21QOm5nk0R2avgCH0ulrfiUIo2PnyYWvQaGVw="; }; nativeBuildInputs = [ makeWrapper ]; @@ -20,51 +57,61 @@ stdenv.mkDerivation { dontUnpack = true; libPath = lib.makeLibraryPath [ - alsa-lib - cups - curl - dbus - expat - fontconfig - freetype - glib - gst_all_1.gst-plugins-base - gst_all_1.gstreamer - harfbuzz - libcap - libGLU libGL - libpulseaudio - libxkbcommon - libxml2 - libxslt - nspr - nss - openssl_1_1 - stdenv.cc.cc - systemd - wayland - zlib + alsa-lib + brotli + cups + curl + dbus + expat + fontconfig + freetype + glib + gst_all_1.gst-plugins-base + gst_all_1.gstreamer + harfbuzz + lcms + libcap + libevent + libGLU + libGL + libkrb5 + libopus + libpulseaudio + libxkbcommon + libxkbfile + libxml2 + libxslt + libwebp + mesa + nspr + nss + openssl + snappy + stdenv.cc.cc + systemd + wayland + zlib + zstd - xorg.libICE - xorg.libSM - xorg.libX11 - xorg.libxcb - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXScrnSaver - xorg.libXtst - xorg.xcbutilimage - xorg.xcbutilkeysyms - xorg.xcbutilrenderutil - xorg.xcbutilwm - ] - ; + xorg.libICE + xorg.libSM + xorg.libX11 + xorg.libxcb + xorg.libXcomposite + xorg.libXcursor + xorg.libXdamage + xorg.libXext + xorg.libXfixes + xorg.libXi + xorg.libXrandr + xorg.libXrender + xorg.libXScrnSaver + xorg.libXtst + xorg.xcbutilimage + xorg.xcbutilkeysyms + xorg.xcbutilrenderutil + xorg.xcbutilwm + ]; installPhase = '' dpkg-deb -x $src $out diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 74f70b71c4988..e9cb879169e12 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "6.1.0.35886"; - versions.x86_64-darwin = "6.1.0.35886"; - versions.x86_64-linux = "6.1.0.198"; + versions.aarch64-darwin = "6.1.1.36333"; + versions.x86_64-darwin = "6.1.1.36333"; + versions.x86_64-linux = "6.1.1.443"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-jAH/3r2AM8WAzfHE8CvKBrr53sM/9DH624C+EiJIdXs="; + hash = "sha256-CBBJAa7hnz0I2ctEn7DMdzeXEs4x+aEmEr+L42ddqXE="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-nKJPZQbyVG+P974hP4+4eAtupEQOf5Kl64Zp+jV/Ka0="; + hash = "sha256-CHtyL/BdyBVCQOGWjP0H/5GJiq67hPNQxELlvzzUuts="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-R4f0dnwqkODFeo8mPBecAI/AGQLwYkcNtJq6UVXCPfI="; + hash = "sha256-2FOAZ3MKusouuWvhxFEcqX+2e+PCF4N5zaz7mc9Mnq4="; }; }; |