diff options
| author | Bastian Köcher <git@kchr.de> | 2020-02-12 09:46:37 +0100 |
|---|---|---|
| committer | Bastian Köcher <git@kchr.de> | 2020-02-12 09:46:37 +0100 |
| commit | f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853 (patch) | |
| tree | 2706afee99f909d87ccb801dc91f42b10dae4840 /pkgs/applications/kde/kdepim-runtime | |
| parent | 2f618146653ed55632fc2f0c720aec16246cf1a3 (diff) | |
| download | nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar.gz nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar.bz2 nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar.lz nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar.xz nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.tar.zst nixpkgs-f2c564b1242a6ba7c4d0c2f37b03de5b4d63c853.zip | |
kdepim-runtime: Remove obsolete patch to fix compilation
The facebook plugin is currently disabled by upstream.
Diffstat (limited to 'pkgs/applications/kde/kdepim-runtime')
| -rw-r--r-- | pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch | 12 | ||||
| -rw-r--r-- | pkgs/applications/kde/kdepim-runtime/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/kde/kdepim-runtime/series | 1 |
3 files changed, 0 insertions, 16 deletions
diff --git a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch b/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch deleted file mode 100644 index 46722ff5fba..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 index 6d7bd0daa96..65719514f96 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -14,7 +14,6 @@ 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 @@ -22,6 +21,4 @@ mkDerivation { 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 deleted file mode 100644 index cc3e104775f..00000000000 --- a/pkgs/applications/kde/kdepim-runtime/series +++ /dev/null @@ -1 +0,0 @@ -00-no-facebook.patch |