From 044cd208b7507afc4d086493de392c35dfb88298 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Mon, 22 Apr 2019 16:18:49 +0200
Subject: [PATCH] kdepim-runtime: replace sed by a proper patch

- remove unused qca-qt5
---
 pkgs/applications/kde/default.nix                   |  2 +-
 .../kde/kdepim-runtime/00-no-facebook.patch         | 12 ++++++++++++
 .../default.nix}                                    | 13 ++++---------
 pkgs/applications/kde/kdepim-runtime/series         |  1 +
 .../libraries/qt-5/modules/qtnetworkauth.nix        |  1 -
 5 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
 rename pkgs/applications/kde/{kdepim-runtime.nix => kdepim-runtime/default.nix} (73%)
 create mode 100644 pkgs/applications/kde/kdepim-runtime/series

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 239d71fdfaf..a2e10ee2c02 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/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
new file mode 100644
index 00000000000..46722ff5fba
--- /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.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
similarity index 73%
rename from pkgs/applications/kde/kdepim-runtime.nix
rename to pkgs/applications/kde/kdepim-runtime/default.nix
index f56fd0b999e..6d7bd0daa96 100644
--- a/pkgs/applications/kde/kdepim-runtime.nix
+++ b/pkgs/applications/kde/kdepim-runtime/default.nix
@@ -1,12 +1,11 @@
 {
-  mkDerivation, lib, kdepimTeam,
+  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, qtspeech, qtxmlpatterns,
-  qca-qt5, qtnetworkauth
+  pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
 }:
 
 mkDerivation {
@@ -15,18 +14,14 @@ mkDerivation {
     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 qtspeech qtxmlpatterns qca-qt5 qtnetworkauth
+    pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
   ];
   # 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/series b/pkgs/applications/kde/kdepim-runtime/series
new file mode 100644
index 00000000000..cc3e104775f
--- /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 3d36f30b9ee..e6ef428cc3c 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" ];
 }