Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport release-24.11] qtox: 1.17.6 -> 1.18.0, switch to TokTok fork #373199

Merged
merged 1 commit into from
Jan 12, 2025
+13 −20
Merged

[Backport release-24.11] qtox: 1.17.6 -> 1.18.0, switch to TokTok fork #373199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 12 additions & 17 deletions pkgs/applications/networking/instant-messengers/qtox/default.nix
View file
Open in desktop
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,27 @@
, 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 +48,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
4 changes: 1 addition & 3 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15499,9 +15499,7 @@ with pkgs;

qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };

qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox {
inherit (darwin.apple_sdk.frameworks) AVFoundation;
};
qtox = callPackage ../applications/networking/instant-messengers/qtox { };

qtpass = libsForQt5.callPackage ../applications/misc/qtpass { };

Expand Down