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 eeac3c06a725..00fa69b85b8f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -5,6 +5,10 @@ fetchpatch, libsForQt5, yasm, + alsa-lib, + jemalloc, + libopus, + libpulseaudio, withWebkit ? true, }: @@ -38,7 +42,7 @@ in telegram-desktop.override { pname = "kotatogram-desktop"; inherit withWebkit; - unwrapped = (telegram-desktop.unwrapped.override { inherit tg_owt; }).overrideAttrs { + unwrapped = (telegram-desktop.unwrapped.override { inherit tg_owt; }).overrideAttrs (old: { pname = "kotatogram-desktop-unwrapped"; version = "${version}-unstable-2024-09-27"; @@ -60,6 +64,13 @@ telegram-desktop.override { }) ]; + buildInputs = (old.buildInputs or [ ]) ++ [ + alsa-lib + jemalloc + libopus + libpulseaudio + ]; + meta = { description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' @@ -74,5 +85,5 @@ telegram-desktop.override { maintainers = with lib.maintainers; [ ilya-fedin ]; mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; }; - }; + }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index c7b7814e2f32..09e45cb750c7 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -20,14 +20,10 @@ protobuf, openalSoft, minizip, - libopus, - alsa-lib, - libpulseaudio, range-v3, tl-expected, hunspell, gobject-introspection, - jemalloc, rnnoise, microsoft-gsl, boost, @@ -46,25 +42,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.15.4"; + version = "5.16.4"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-C7mUV/Jc0OJnVXxRGVx/l2T7APOsY05t5MLW8laIwnA="; + hash = "sha256-yU2Ai2JgxDlaTK5GsL+yWkwtFbk14tPRAj1Rdt+gmmQ="; }; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioInputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioOutputALSA.cpp \ - --replace-fail '"libasound.so.2"' '"${lib.getLib alsa-lib}/lib/libasound.so.2"' - substituteInPlace Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp \ - --replace-fail '"libpulse.so.0"' '"${lib.getLib libpulseaudio}/lib/libpulse.so.0"' - ''; - nativeBuildInputs = [ pkg-config @@ -87,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg_6 openalSoft minizip - libopus range-v3 tl-expected rnnoise @@ -101,10 +87,7 @@ stdenv.mkDerivation (finalAttrs: { protobuf qtwayland kcoreaddons - alsa-lib - libpulseaudio hunspell - jemalloc ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_15 diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index b9dca41b39ae..159e3c743907 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -4,6 +4,10 @@ fetchFromGitHub, fetchpatch, telegram-desktop, + alsa-lib, + jemalloc, + libopus, + libpulseaudio, withWebkit ? true, }: @@ -32,6 +36,13 @@ telegram-desktop.override { }) ]; + buildInputs = (old.buildInputs or [ ]) ++ [ + alsa-lib + jemalloc + libopus + libpulseaudio + ]; + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true) ]; diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix index 8374b8407a40..e4e58d3a8010 100644 --- a/pkgs/by-name/ay/ayugram-desktop/package.nix +++ b/pkgs/by-name/ay/ayugram-desktop/package.nix @@ -13,13 +13,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "ayugram-desktop-unwrapped"; - version = "5.14.3"; + version = "5.16.3"; src = fetchFromGitHub { owner = "AyuGram"; repo = "AyuGramDesktop"; - tag = "v${finalAttrs.version}"; - hash = "sha256-cirUnGtjEc8aQzXH0r5kVhobEqf63eoZ17Gg99e+FCQ="; + rev = "aafdac6da465e6498e39e1b55566fc8fe2402843"; + hash = "sha256-GNFkGw/CxtbeoEMBjExNudBcKFwlfXee5VVnXa4wGko="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/materialgram/package.nix b/pkgs/by-name/ma/materialgram/package.nix index ef699ae5d390..2d328a62fd1a 100644 --- a/pkgs/by-name/ma/materialgram/package.nix +++ b/pkgs/by-name/ma/materialgram/package.nix @@ -11,13 +11,13 @@ telegram-desktop.override { unwrapped = telegram-desktop.unwrapped.overrideAttrs ( finalAttrs: previousAttrs: { pname = "materialgram-unwrapped"; - version = "5.14.3.1"; + version = "5.16.4.1"; src = fetchFromGitHub { owner = "kukuruzka165"; repo = "materialgram"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-wnhEnhNeuY7eRvmsDnpZ2CiKHXFvgIYpZp2ftjq54/Q="; + hash = "sha256-sN+Asoy9oZ08wZv9y454HqBxkEK7Zt0ynmfyuzk/SBc="; fetchSubmodules = true; };