kdepim-runtime: replace sed by a proper patch

- remove unused qca-qt5
wip/yesman
Jos van den Oever 5 years ago committed by worldofpeace
parent ec4448a376
commit 044cd208b7
  1. 2
      pkgs/applications/kde/default.nix
  2. 12
      pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
  3. 13
      pkgs/applications/kde/kdepim-runtime/default.nix
  4. 1
      pkgs/applications/kde/kdepim-runtime/series
  5. 1
      pkgs/development/libraries/qt-5/modules/qtnetworkauth.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 {};

@ -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 )

@ -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'
'';
}

@ -3,5 +3,4 @@
qtModule {
name = "qtnetworkauth";
qtInputs = [ qtbase ];
outputs = [ "out" "dev" "bin" ];
}

Loading…
Cancel
Save