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 6b2727c7267e..0b52d3f38a7e 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -7,6 +7,7 @@ , ninja , clang , lld +, yasm , python3 , wrapQtAppsHook , removeReferencesTo @@ -37,10 +38,22 @@ }: let - tg_owt = callPackage ./tg_owt.nix { + tg_owt = (callPackage ../telegram-desktop/tg_owt.nix { # tg_owt should use the same compiler inherit stdenv; - }; + }).overrideAttrs(oldAttrs: { + version = "0-unstable-2024-06-15"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; + hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; + }); mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; in 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 deleted file mode 100644 index 40dda5c25347..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, fetchpatch2 -, pkg-config -, cmake -, ninja -, yasm -, libjpeg -, openssl -, libopus -, ffmpeg -, openh264 -, crc32c -, libvpx -, libX11 -, libXtst -, libXcomposite -, libXdamage -, libXext -, libXrender -, libXrandr -, libXi -, glib -, abseil-cpp -, pipewire -, mesa -, libdrm -, libGL -, darwin -}: - -stdenv.mkDerivation { - pname = "tg_owt"; - version = "0-unstable-2024-06-15"; - - src = fetchFromGitHub { - owner = "desktop-app"; - repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; - fetchSubmodules = true; - }; - - patches = [ - # Remove usage of AVCodecContext::reordered_opaque - (fetchpatch2 { - name = "webrtc-ffmpeg-7.patch"; - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-EdwHeVko8uDsP5GTw2ryWiQgRVCAdPc1me6hySdiwMU="; - }) - ]; - - postPatch = lib.optionalString stdenv.hostPlatform.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"' \ - --replace '"libdrm.so.2"' '"${libdrm}/lib/libdrm.so.2"' - ''; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ pkg-config cmake ninja yasm ]; - - propagatedBuildInputs = [ - libjpeg - openssl - libopus - ffmpeg - openh264 - crc32c - libvpx - abseil-cpp - ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - libX11 - libXtst - libXcomposite - libXdamage - libXext - libXrender - libXrandr - libXi - glib - pipewire - mesa - libdrm - libGL - ] ++ lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ - Cocoa - AppKit - IOKit - IOSurface - Foundation - AVFoundation - CoreMedia - VideoToolbox - CoreGraphics - CoreVideo - OpenGL - Metal - MetalKit - CoreFoundation - ApplicationServices - ]); - - meta.license = lib.licenses.bsd3; -}