From 895e78c9bc51d63b5cb0b9a49fd6b0a60bb5d497 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 23 Apr 2019 11:05:38 +0200 Subject: qt5.qtnetworkauth: init --- pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix (limited to 'pkgs/development/libraries/qt-5/modules') diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix new file mode 100644 index 000000000000..3d36f30b9ee2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -0,0 +1,7 @@ +{ qtModule, qtbase }: + +qtModule { + name = "qtnetworkauth"; + qtInputs = [ qtbase ]; + outputs = [ "out" "dev" "bin" ]; +} -- cgit 1.4.1 From 044cd208b7507afc4d086493de392c35dfb88298 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 22 Apr 2019 16:18:49 +0200 Subject: kdepim-runtime: replace sed by a proper patch - remove unused qca-qt5 --- pkgs/applications/kde/default.nix | 2 +- pkgs/applications/kde/kdepim-runtime.nix | 32 ---------------------- .../kde/kdepim-runtime/00-no-facebook.patch | 12 ++++++++ pkgs/applications/kde/kdepim-runtime/default.nix | 27 ++++++++++++++++++ pkgs/applications/kde/kdepim-runtime/series | 1 + .../libraries/qt-5/modules/qtnetworkauth.nix | 1 - 6 files changed, 41 insertions(+), 34 deletions(-) delete mode 100644 pkgs/applications/kde/kdepim-runtime.nix create mode 100644 pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch create mode 100644 pkgs/applications/kde/kdepim-runtime/default.nix create mode 100644 pkgs/applications/kde/kdepim-runtime/series (limited to 'pkgs/development/libraries/qt-5/modules') diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index 239d71fdfaf1..a2e10ee2c028 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -102,7 +102,7 @@ let kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {}; kdenlive = callPackage ./kdenlive.nix {}; - kdepim-runtime = callPackage ./kdepim-runtime.nix {}; + kdepim-runtime = callPackage ./kdepim-runtime {}; kdepim-addons = callPackage ./kdepim-addons.nix {}; kdepim-apps-libs = callPackage ./kdepim-apps-libs {}; kdf = callPackage ./kdf.nix {}; diff --git a/pkgs/applications/kde/kdepim-runtime.nix b/pkgs/applications/kde/kdepim-runtime.nix deleted file mode 100644 index f56fd0b999ed..000000000000 --- a/pkgs/applications/kde/kdepim-runtime.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - mkDerivation, lib, kdepimTeam, - extra-cmake-modules, kdoctools, - shared-mime-info, - akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, - kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, - kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns, - qca-qt5, qtnetworkauth -}: - -mkDerivation { - name = "kdepim-runtime"; - meta = { - license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; - }; - nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; - buildInputs = [ - akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes - kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap - kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtspeech qtxmlpatterns qca-qt5 qtnetworkauth - ]; - # Attempts to build some files before dependencies have been generated - enableParallelBuilding = false; - - # build failure, not worth fixing, rc anyway - postPatch = '' - sed -i resources/CMakeLists.txt -e '/facebook/d' - ''; -} diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch new file mode 100644 index 000000000000..46722ff5fba0 --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch @@ -0,0 +1,12 @@ +diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt +index 99f7dbf..03e953b 100644 +--- a/resources/CMakeLists.txt ++++ b/resources/CMakeLists.txt +@@ -45,7 +45,6 @@ add_subdirectory( imap ) + if (Libkolabxml_FOUND) + add_subdirectory( kolab ) + endif() +-add_subdirectory( facebook ) + add_subdirectory( maildir ) + + add_subdirectory( openxchange ) diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix new file mode 100644 index 000000000000..6d7bd0daa96b --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -0,0 +1,27 @@ +{ + mkDerivation, copyPathsToStore, lib, kdepimTeam, + extra-cmake-modules, kdoctools, + shared-mime-info, + akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, + kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, + kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, +}: + +mkDerivation { + name = "kdepim-runtime"; + meta = { + license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; + maintainers = kdepimTeam; + }; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ]; + buildInputs = [ + akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes + kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap + kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns + ]; + # Attempts to build some files before dependencies have been generated + enableParallelBuilding = false; +} diff --git a/pkgs/applications/kde/kdepim-runtime/series b/pkgs/applications/kde/kdepim-runtime/series new file mode 100644 index 000000000000..cc3e104775ff --- /dev/null +++ b/pkgs/applications/kde/kdepim-runtime/series @@ -0,0 +1 @@ +00-no-facebook.patch diff --git a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix index 3d36f30b9ee2..e6ef428cc3c4 100644 --- a/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix +++ b/pkgs/development/libraries/qt-5/modules/qtnetworkauth.nix @@ -3,5 +3,4 @@ qtModule { name = "qtnetworkauth"; qtInputs = [ qtbase ]; - outputs = [ "out" "dev" "bin" ]; } -- cgit 1.4.1