diff --git a/pkgs/development/libraries/qxmpp/default.nix b/pkgs/by-name/qx/qxmpp/package.nix similarity index 58% rename from pkgs/development/libraries/qxmpp/default.nix rename to pkgs/by-name/qx/qxmpp/package.nix index 3fe969629394..de253a65b997 100644 --- a/pkgs/development/libraries/qxmpp/default.nix +++ b/pkgs/by-name/qx/qxmpp/package.nix @@ -1,33 +1,32 @@ { stdenv, lib, - fetchFromGitHub, + fetchFromGitLab, cmake, pkg-config, - wrapQtAppsNoGuiHook, - qtbase, - qca, + kdePackages, withGstreamer ? true, gst_all_1, withOmemo ? true, libomemo-c, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "qxmpp"; - version = "1.10.2"; + version = "1.10.4"; - src = fetchFromGitHub { - owner = "qxmpp-project"; - repo = pname; - rev = "v${version}"; - hash = "sha256-M3F4tNIO3RvDxk/lce8/J6kmQtnsGLILQ15uEzgyfds="; + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "qxmpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-iSsQKVfcH5AjX+bURYK7UPdZKWFX6WaFSrpeRC5IE/0="; }; nativeBuildInputs = [ cmake - wrapQtAppsNoGuiHook + kdePackages.wrapQtAppsNoGuiHook ] ++ lib.optionals (withGstreamer || withOmemo) [ pkg-config @@ -43,8 +42,8 @@ stdenv.mkDerivation rec { ] ) ++ lib.optionals withOmemo [ - qtbase - qca + kdePackages.qtbase + kdePackages.qca libomemo-c ]; cmakeFlags = @@ -59,11 +58,11 @@ stdenv.mkDerivation rec { "-DBUILD_OMEMO=ON" ]; - meta = with lib; { + meta = { description = "Cross-platform C++ XMPP client and server library"; - homepage = "https://github.com/qxmpp-project/qxmpp"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ astro ]; - platforms = with platforms; linux; + homepage = "https://invent.kde.org/libraries/qxmpp"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ astro ]; + platforms = with lib.platforms; linux; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea80b6761dfa..2fd2450d33d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8323,8 +8323,6 @@ with pkgs; } ); - qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { }; - gnutls = callPackage ../development/libraries/gnutls { util-linux = util-linuxMinimal; # break the cyclic dependency autoconf = buildPackages.autoconf269;