diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix index 3c6ed88aa9b..d24e19f89e7 100644 --- a/pkgs/applications/kde/akonadi/default.nix +++ b/pkgs/applications/kde/akonadi/default.nix @@ -1,8 +1,9 @@ { mkDerivation, lib, kdepimTeam, - extra-cmake-modules, shared-mime-info, qtbase, - boost, kcompletion, kconfigwidgets, kcrash, kdbusaddons, kdesignerplugin, - ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + extra-cmake-modules, shared-mime-info, qtbase, accounts-qt, + boost, kaccounts-integration, kcompletion, kconfigwidgets, kcrash, kdbusaddons, + kdesignerplugin, ki18n, kiconthemes, kio, kitemmodels, kwindowsystem, mysql, qttools, + signond, }: mkDerivation { @@ -19,8 +20,8 @@ mkDerivation { ]; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin ki18n - kiconthemes kio kwindowsystem qttools + kaccounts-integration kcompletion kconfigwidgets kcrash kdbusaddons kdesignerplugin + ki18n kiconthemes kio kwindowsystem accounts-qt qttools signond ]; propagatedBuildInputs = [ boost kitemmodels ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index f60ac76653d..33f392fdccc 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -86,6 +86,7 @@ let gwenview = callPackage ./gwenview.nix {}; incidenceeditor = callPackage ./incidenceeditor.nix {}; k3b = callPackage ./k3b.nix {}; + kaccounts-integration = callPackage ./kaccounts-integration.nix {}; kaddressbook = callPackage ./kaddressbook.nix {}; kalarm = callPackage ./kalarm.nix {}; kalarmcal = callPackage ./kalarmcal.nix {}; diff --git a/pkgs/applications/kde/kaccounts-integration.nix b/pkgs/applications/kde/kaccounts-integration.nix new file mode 100644 index 00000000000..9ad1b05dd92 --- /dev/null +++ b/pkgs/applications/kde/kaccounts-integration.nix @@ -0,0 +1,23 @@ +{ mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcoreaddons, kwallet, accounts-qt, signond }: + +mkDerivation { + name = "kaccounts-integration"; + meta = with lib; { + homepage = "https://community.kde.org/KTp/Setting_up_KAccounts"; + description = "Online accounts integration"; + maintainers = with maintainers; [ freezeboy ]; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; + nativeBuildInputs = [ + extra-cmake-modules + ]; + buildInputs = [ + kcmutils + kcoreaddons + kdoctools + kwallet + accounts-qt + signond + ]; +} diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix index b60d8d07385..4e2e33b852e 100644 --- a/pkgs/development/libraries/accounts-qt/default.nix +++ b/pkgs/development/libraries/accounts-qt/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }: +{ mkDerivation, lib, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "accounts-qt"; version = "1.16"; @@ -11,17 +11,13 @@ stdenv.mkDerivation rec { owner = "accounts-sso"; }; - buildInputs = [ glib libaccounts-glib qtbase ]; + propagatedBuildInputs = [ glib libaccounts-glib ]; nativeBuildInputs = [ doxygen pkgconfig qmake ]; - preConfigure = '' - qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake" - ''; - # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Qt library for accessing the online accounts database"; homepage = "https://gitlab.com/accounts-sso"; license = licenses.lgpl21; diff --git a/pkgs/development/libraries/signond/default.nix b/pkgs/development/libraries/signond/default.nix new file mode 100644 index 00000000000..7e986ed2635 --- /dev/null +++ b/pkgs/development/libraries/signond/default.nix @@ -0,0 +1,30 @@ +{ mkDerivation, lib, fetchFromGitLab, qmake, doxygen }: + +mkDerivation rec { + pname = "signond"; + version = "8.60"; + + src = fetchFromGitLab { + owner = "accounts-sso"; + repo = pname; + rev = "VERSION_${version}"; + sha256 = "pFpeJ13ut5EoP37W33WrYL2LzkX/k7ZKJcRpPO5l8i4="; + }; + + nativeBuildInputs = [ + qmake + doxygen + ]; + + preConfigure = '' + substituteInPlace src/signond/signond.pro \ + --replace "/etc" "@out@/etc" + ''; + + meta = with lib; { + homepage = "https://gitlab.com/accounts-sso/signond"; + description = "Signon Daemon for Qt"; + maintainers = with maintainers; [ freezeboy ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 30ab4e774a8..5815eb1c569 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15768,9 +15768,9 @@ in inherit (kdeApplications.override { libsForQt5 = self; }) libkdcraw libkexiv2 libkipi libkomparediff2 libksane libkcddb akonadi-contacts - akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface - kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs filelight - granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic + akonadi-calendar akonadi-notes akonadi-search kaccounts-integration kidentitymanagement + kontactinterface kldap akonadi akregator ark bomber bovo dolphin dragon elisa ffmpegthumbs + filelight granatier gwenview k3b kaddressbook kalzium kapptemplate kapman kate katomic kblackbox kblocks kbounce kcachegrind kcalc kcharselect kcolorchooser kdenlive kdf kdialog kdiamond keditbookmarks kfind kfloppy kget kgpg khelpcenter kig kigo killbots kitinerary kleopatra klettres klines kmag kmail kmines kmix kmplot @@ -15918,6 +15918,8 @@ in # Not a library, but we do want it to be built for every qt version there # is, to allow users to choose the right build if needed. sddm = callPackage ../applications/display-managers/sddm { }; + + signond = callPackage ../development/libraries/signond {}; }; qtEnv = qt5.env;