diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index e154ab8eafe2..b461a3c07864 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -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 diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2c35624ddb2a..69c331861864 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bfbfaeec30c6..7a47288afcc1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 637396511355..8a6bbb710b6f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -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 { }; diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix index 9a883053f477..c5feac2b1489 100644 --- a/pkgs/top-level/qt6-packages.nix +++ b/pkgs/top-level/qt6-packages.nix @@ -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; };