Skip to content

Commit

Permalink
qtox: 1.17.6 -> 1.18.0, switch to TokTok fork
Browse files Browse the repository at this point in the history
The original qTox is unmaintained, the repo is archived since Feb 2023.

Upstream warns about unofficial forks, however:

* TokTok are the maintainers of toxcore
* qtox.meta.homepage was set to tox.chat and
  the TokTok fork is listed in the tox.chat client list
  • Loading branch information
fgaz committed Jan 4, 2025
1 parent c34ae6f commit 89da14b
Showing 1 changed file with 11 additions and 15 deletions.
26 changes: 11 additions & 15 deletions pkgs/applications/networking/instant-messengers/qtox/default.nix
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
{ lib
, stdenv
, mkDerivation
, fetchFromGitHub
, cmake
, pkg-config
, perl
, kdePackages
, libtoxcore
, libpthreadstubs
, libXdmcp
, libXScrnSaver
, qtbase
, qtsvg
, qttools
, ffmpeg
, filter-audio
, libexif
Expand All @@ -21,28 +18,28 @@
, openal
, pcre
, qrencode
, qt6
, sqlcipher
, AVFoundation
}:

mkDerivation rec {
stdenv.mkDerivation rec {
pname = "qtox";
version = "1.17.6";
version = "1.18.0";

src = fetchFromGitHub {
owner = "qTox";
owner = "TokTok";
repo = "qTox";
rev = "v${version}";
sha256 = "sha256-naKWoodSMw0AEtACvkASFmw9t0H0d2pcqOW79NNTYF0=";
tag = "v${version}";
hash = "sha256-UgUlWeFrNoNR1ZwobfNLmDBn9/Aw4LUMeSgIfrq/uqo=";
};

buildInputs = [
kdePackages.sonnet
libtoxcore
libpthreadstubs
libXdmcp
libXScrnSaver
qtbase
qtsvg
ffmpeg
filter-audio
libexif
Expand All @@ -52,17 +49,16 @@ mkDerivation rec {
openal
pcre
qrencode
qt6.qtbase
qt6.qtsvg
sqlcipher
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ AVFoundation ];

nativeBuildInputs = [ cmake pkg-config qttools ]
nativeBuildInputs = [ cmake pkg-config qt6.qttools qt6.wrapQtAppsHook ]
++ lib.optionals stdenv.hostPlatform.isDarwin [ perl ];

cmakeFlags = [
"-DGIT_DESCRIBE=v${version}"
"-DENABLE_STATUSNOTIFIER=False"
"-DENABLE_GTK_SYSTRAY=False"
"-DENABLE_APPINDICATOR=False"
"-DTIMESTAMP=1"
];

Expand Down

0 comments on commit 89da14b

Please sign in to comment.