diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix index 156375d8a2da..850d0c1caa70 100644 --- a/pkgs/development/libraries/libquotient/default.nix +++ b/pkgs/development/libraries/libquotient/default.nix @@ -10,9 +10,6 @@ qtkeychain, }: -let - isQt6 = lib.versions.major qtbase.version == "6"; -in stdenv.mkDerivation rec { pname = "libquotient"; version = "0.9.1"; @@ -41,7 +38,6 @@ 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 c219fa51eca7..3d137225c84c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -188,6 +188,7 @@ let sddm neochat # added 2025-07-04 itinerary # added 2025-07-04 + libquotient # added 2025-07-04 ; }; @@ -1054,7 +1055,7 @@ mapAliases { libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17 libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20 libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25 - libquotient = libsForQt5.libquotient; # Added 2023-11-11 + libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04 librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as its upstream is unmaintained"; # Added 2024-06-10 librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17 librdf_raptor = throw "librdf_raptor has been remove due to failing to build and being unmaintained"; # Added 2025-04-14 diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 9d67d8024bcc..0e635efa2316 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -202,8 +202,6 @@ makeScopeWithSplicing' { libqtpas = callPackage ../development/compilers/fpc/libqtpas.nix { }; - libquotient = callPackage ../development/libraries/libquotient { }; - libqaccessibilityclient = callPackage ../development/libraries/libqaccessibilityclient { }; mapbox-gl-native = libsForQt5.callPackage ../development/libraries/mapbox-gl-native { };