Unverified Commit c2074261 authored by Sizhe Zhao's avatar Sizhe Zhao
Browse files

qxmpp: move to by-name

parent 3cd05186
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@
  fetchFromGitHub,
  cmake,
  pkg-config,
  wrapQtAppsNoGuiHook,
  qtbase,
  qca,
  kdePackages,
  withGstreamer ? true,
  gst_all_1,
  withOmemo ? true,
@@ -27,7 +25,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs =
    [
      cmake
      wrapQtAppsNoGuiHook
      kdePackages.wrapQtAppsNoGuiHook
    ]
    ++ lib.optionals (withGstreamer || withOmemo) [
      pkg-config
@@ -43,8 +41,8 @@ stdenv.mkDerivation rec {
      ]
    )
    ++ lib.optionals withOmemo [
      qtbase
      qca
      kdePackages.qtbase
      kdePackages.qca
      libomemo-c
    ];
  cmakeFlags =
+0 −2
Original line number Diff line number Diff line
@@ -8327,8 +8327,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;