From f287805fafbf9f9b3ad024a35db6b81dad76f491 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 26 Jun 2021 18:44:59 +0200 Subject: [PATCH] kotatogram-desktop: Copy the old tg_owt.nix from tdesktop The current tg_owt version (since the update of tdesktop to version 2.8.0 in 0d509d366d4) isn't compatible with kotatogram-desktop anymore. --- .../telegram/kotatogram-desktop/default.nix | 2 +- .../telegram/kotatogram-desktop/tg_owt.nix | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix 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 02330d110788..d9f9cd91a52d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -11,7 +11,7 @@ with lib; let - tg_owt = callPackage ../tdesktop/tg_owt.nix {}; + tg_owt = callPackage ./tg_owt.nix {}; in mkDerivation rec { pname = "kotatogram-desktop"; version = "1.4.1"; 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 new file mode 100644 index 000000000000..614183b72d08 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/tg_owt.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchFromGitHub, pkg-config, cmake, ninja, yasm +, libjpeg, openssl, libopus, ffmpeg, alsa-lib, libpulseaudio, protobuf +, xorg, libXtst +}: + +let + rev = "2d804d2c9c5d05324c8ab22f2e6ff8306521b3c3"; + sha256 = "0kz0i381iwsgcc3yzsq7njx3gkqja4bb9fsgc24vhg0md540qhyn"; + +in stdenv.mkDerivation { + pname = "tg_owt"; + version = "git-${rev}"; + + src = fetchFromGitHub { + owner = "desktop-app"; + repo = "tg_owt"; + inherit rev sha256; + fetchSubmodules = true; + }; + + outputs = [ "out" "dev" ]; + + nativeBuildInputs = [ pkg-config cmake ninja yasm ]; + + buildInputs = [ + libjpeg openssl libopus ffmpeg alsa-lib libpulseaudio protobuf + xorg.libX11 libXtst + ]; + + cmakeFlags = [ + # Building as a shared library isn't officially supported and currently broken: + "-DBUILD_SHARED_LIBS=OFF" + ]; + + meta.license = lib.licenses.bsd3; +}