tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
kdeApplications.kmailtransport: fix build
gnidorah
8 years ago
7dc2db98
a8ba8405
+45
-2
4 changed files
expand all
collapse all
unified
split
pkgs
applications
kde
default.nix
kmailtransport.nix
ksmtp
0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
default.nix
+1
pkgs/applications/kde/default.nix
···
124
124
kontactinterface = callPackage ./kontactinterface.nix {};
125
125
korganizer = callPackage ./korganizer.nix {};
126
126
kpimtextedit = callPackage ./kpimtextedit.nix {};
127
127
+
ksmtp = callPackage ./ksmtp {};
127
128
kqtquickcharts = callPackage ./kqtquickcharts.nix {};
128
129
krdc = callPackage ./krdc.nix {};
129
130
krfb = callPackage ./krfb.nix {};
+2
-2
pkgs/applications/kde/kmailtransport.nix
···
1
1
{
2
2
mkDerivation, lib, kdepimTeam,
3
3
extra-cmake-modules, kdoctools,
4
4
-
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
4
4
+
akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
5
5
}:
6
6
7
7
mkDerivation {
···
11
11
maintainers = kdepimTeam;
12
12
};
13
13
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
14
14
-
buildInputs = [ akonadi kcmutils ki18n kio ];
14
14
+
buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
15
15
propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
16
16
outputs = [ "out" "dev" ];
17
17
}
+25
pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch
···
1
1
+
From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
2
2
+
From: gnidorah <gnidorah@users.noreply.github.com>
3
3
+
Date: Fri, 22 Dec 2017 19:32:47 +0300
4
4
+
Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
5
5
+
6
6
+
---
7
7
+
src/CMakeLists.txt | 2 +-
8
8
+
1 file changed, 1 insertion(+), 1 deletion(-)
9
9
+
10
10
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
11
11
+
index 83c2bcb..5f6d47c 100644
12
12
+
--- a/src/CMakeLists.txt
13
13
+
+++ b/src/CMakeLists.txt
14
14
+
@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
15
15
+
REQUIRED_HEADERS KSMTP_HEADERS
16
16
+
)
17
17
+
18
18
+
-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
19
19
+
+install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
20
20
+
21
21
+
install(FILES
22
22
+
${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
23
23
+
--
24
24
+
2.15.1
25
25
+
+17
pkgs/applications/kde/ksmtp/default.nix
···
1
1
+
{
2
2
+
mkDerivation, lib, kdepimTeam,
3
3
+
extra-cmake-modules, kdoctools,
4
4
+
kcoreaddons, kio, kmime, cyrus_sasl
5
5
+
}:
6
6
+
7
7
+
mkDerivation {
8
8
+
name = "ksmtp";
9
9
+
meta = {
10
10
+
license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
11
11
+
maintainers = kdepimTeam;
12
12
+
};
13
13
+
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
14
14
+
buildInputs = [ kcoreaddons kio kmime ];
15
15
+
propagatedBuildInputs = [ cyrus_sasl ];
16
16
+
patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
17
17
+
}