kdeApplications.kmailtransport: fix build

This commit is contained in:
gnidorah 2017-12-22 19:37:16 +03:00
parent a8ba8405d8
commit 7dc2db982c
4 changed files with 45 additions and 2 deletions

View file

@ -124,6 +124,7 @@ let
kontactinterface = callPackage ./kontactinterface.nix {};
korganizer = callPackage ./korganizer.nix {};
kpimtextedit = callPackage ./kpimtextedit.nix {};
ksmtp = callPackage ./ksmtp {};
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
krdc = callPackage ./krdc.nix {};
krfb = callPackage ./krfb.nix {};

View file

@ -1,7 +1,7 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
}:
mkDerivation {
@ -11,7 +11,7 @@ mkDerivation {
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ akonadi kcmutils ki18n kio ];
buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
outputs = [ "out" "dev" ];
}

View file

@ -0,0 +1,25 @@
From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Fri, 22 Dec 2017 19:32:47 +0300
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
---
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 83c2bcb..5f6d47c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
REQUIRED_HEADERS KSMTP_HEADERS
)
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
--
2.15.1

View file

@ -0,0 +1,17 @@
{
mkDerivation, lib, kdepimTeam,
extra-cmake-modules, kdoctools,
kcoreaddons, kio, kmime, cyrus_sasl
}:
mkDerivation {
name = "ksmtp";
meta = {
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
maintainers = kdepimTeam;
};
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ kcoreaddons kio kmime ];
propagatedBuildInputs = [ cyrus_sasl ];
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
}