colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libquotient: add Qt6 support

Browse Source
This commit is contained in:
K900 2023-11-23 22:41:22 +03:00
parent a2a83fc41a
commit 4e616054f5
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/libquotient/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, lib, fetchFromGitHub, cmake, olm, openssl, qtbase, qtmultimedia, qtkeychain }:
stdenv.mkDerivation rec {
let
isQt6 = lib.versions.major qtbase.version == "6";
in stdenv.mkDerivation rec {
pname = "libquotient";
version = "0.8.1.2";
@ -19,6 +21,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DQuotient_ENABLE_E2EE=ON"
(lib.cmakeBool "BUILD_WITH_QT6" isQt6)
];
# https://github.com/quotient-im/libQuotient/issues/551

1
pkgs/top-level/aliases.nix
View File

@ -466,6 +466,7 @@ mapAliases ({
liblastfm = libsForQt5.liblastfm; # Added 2020-06-14
libmongo-client = throw "'libmongo-client' has been removed, upstream gone"; # Added 2023-06-22
libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
libquotient = libsForQt5.libquotient; # Added 2023-11-11
libraw_unstable = throw "'libraw_unstable' has been removed, please use libraw"; # Added 2023-01-30
librdf = lrdf; # Added 2020-03-22
libressl_3_5 = throw "'libressl_3_5' has reached end-of-life "; # Added 2023-05-07

2
pkgs/top-level/all-packages.nix
View File

@ -4376,8 +4376,6 @@ with pkgs;
charles4
;
libquotient = libsForQt5.callPackage ../development/libraries/libquotient { };
quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { };
tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { };

2
pkgs/top-level/qt5-packages.nix
View File

@ -160,6 +160,8 @@ in (noExtraAttrs (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdP
libqtav = callPackage ../development/libraries/libqtav { };
libquotient = callPackage ../development/libraries/libquotient { };
libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
kpmcore = callPackage ../development/libraries/kpmcore { };

1
pkgs/top-level/qt6-packages.nix
View File

@ -34,6 +34,7 @@ makeScopeWithSplicing' {
futuresql = callPackage ../development/libraries/futuresql { };
kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { };
libquotient = callPackage ../development/libraries/libquotient { };
mlt = pkgs.mlt.override {
qt = qt6;
};