Unverified Commit 726f7404 authored by Aleksana's avatar Aleksana Committed by GitHub
Browse files

[Backport release-25.11] {_64gram,kotatogram-desktop}: fix dependency conditions (#465905)

parents 329bb55c 464e54f0

pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix

+14 −6
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ let 
    ];



    nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ];



    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++11-narrowing";

  });

in

telegram-desktop.override {
@@ -69,13 +71,19 @@ telegram-desktop.override { 
      })

    ];



    buildInputs = (old.buildInputs or [ ]) ++ [

    buildInputs =

      (old.buildInputs or [ ])

      ++ [

        libopus

      ]

      ++ lib.optionals stdenv.hostPlatform.isLinux [

        alsa-lib

        jemalloc

      libopus

        libpulseaudio

      ];



    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-missing-template-arg-list-after-template-kw";



    meta = {

      description = "Kotatogram – experimental Telegram Desktop fork";

      longDescription = ''

pkgs/by-name/_6/_64gram/package.nix

+0 −15
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
  lib,

  fetchFromGitHub,

  telegram-desktop,

  alsa-lib,

  jemalloc,

  libopus,

  libpulseaudio,

  withWebkit ? true,

}:
@@ -24,17 +20,6 @@ telegram-desktop.override { 
      fetchSubmodules = true;

    };



    buildInputs = (old.buildInputs or [ ]) ++ [

      alsa-lib

      jemalloc

      libopus

      libpulseaudio

    ];



    cmakeFlags = (old.cmakeFlags or [ ]) ++ [

      (lib.cmakeBool "DESKTOP_APP_DISABLE_AUTOUPDATE" true)

    ];



    meta = {

      description = "Unofficial Telegram Desktop providing Windows 64bit build and extra features";

      license = lib.licenses.gpl3Only;