kdepim-runtime: replace sed by a proper patch
- remove unused qca-qt5
This commit is contained in:
parent
ec4448a376
commit
044cd208b7
@ -102,7 +102,7 @@ let
|
|||||||
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
|
kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
|
||||||
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
|
kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
|
||||||
kdenlive = callPackage ./kdenlive.nix {};
|
kdenlive = callPackage ./kdenlive.nix {};
|
||||||
kdepim-runtime = callPackage ./kdepim-runtime.nix {};
|
kdepim-runtime = callPackage ./kdepim-runtime {};
|
||||||
kdepim-addons = callPackage ./kdepim-addons.nix {};
|
kdepim-addons = callPackage ./kdepim-addons.nix {};
|
||||||
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
|
kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
|
||||||
kdf = callPackage ./kdf.nix {};
|
kdf = callPackage ./kdf.nix {};
|
||||||
|
12
pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
Normal file
12
pkgs/applications/kde/kdepim-runtime/00-no-facebook.patch
Normal file
@ -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,
|
extra-cmake-modules, kdoctools,
|
||||||
shared-mime-info,
|
shared-mime-info,
|
||||||
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
|
akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
|
||||||
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
|
kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
|
||||||
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
|
kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
|
||||||
pimcommon, qtwebengine, libkgapi, qtspeech, qtxmlpatterns,
|
pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
|
||||||
qca-qt5, qtnetworkauth
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
mkDerivation {
|
mkDerivation {
|
||||||
@ -15,18 +14,14 @@ mkDerivation {
|
|||||||
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
|
||||||
maintainers = kdepimTeam;
|
maintainers = kdepimTeam;
|
||||||
};
|
};
|
||||||
|
patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
|
||||||
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
|
nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
|
akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
|
||||||
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
|
kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
|
||||||
kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
|
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
|
# Attempts to build some files before dependencies have been generated
|
||||||
enableParallelBuilding = false;
|
enableParallelBuilding = false;
|
||||||
|
|
||||||
# build failure, not worth fixing, rc anyway
|
|
||||||
postPatch = ''
|
|
||||||
sed -i resources/CMakeLists.txt -e '/facebook/d'
|
|
||||||
'';
|
|
||||||
}
|
}
|
1
pkgs/applications/kde/kdepim-runtime/series
Normal file
1
pkgs/applications/kde/kdepim-runtime/series
Normal file
@ -0,0 +1 @@
|
|||||||
|
00-no-facebook.patch
|
@ -3,5 +3,4 @@
|
|||||||
qtModule {
|
qtModule {
|
||||||
name = "qtnetworkauth";
|
name = "qtnetworkauth";
|
||||||
qtInputs = [ qtbase ];
|
qtInputs = [ qtbase ];
|
||||||
outputs = [ "out" "dev" "bin" ];
|
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user