pyrox.dev
Merge pull request #17435 from ttuegel/konsole-kpart
Add missing Konsole kpart to various KDE applications
authored by Frederik Rietdijk and committed by GitHub f7a48fb8 266fde80
+43
-42
pkgs/applications/editors/kile/frameworks.nix
+43
-42
pkgs/applications/editors/kile/frameworks.nix
···
1
-
{ stdenv
1
+
{ kdeDerivation
2
2
, lib
3
3
, fetchgit
4
-
, extra-cmake-modules
4
+
, ecm
5
5
, kdoctools
6
-
, makeQtWrapper
6
+
, kdeWrapper
7
7
, qtscript
8
8
, kconfig
9
9
, kcrash
···
13
13
, kiconthemes
14
14
, kinit
15
15
, khtml
16
+
, konsole
16
17
, kparts
17
18
, ktexteditor
18
19
, kwindowsystem
19
20
, poppler
20
21
}:
21
22
22
-
stdenv.mkDerivation rec {
23
-
name = "kile-${version}";
24
-
version = "2016-07-02";
23
+
let
24
+
unwrapped =
25
+
kdeDerivation rec {
26
+
name = "kile-${version}";
27
+
version = "2016-07-02";
25
28
26
-
src = fetchgit {
27
-
url = git://anongit.kde.org/kile.git;
28
-
rev = "d38bc7069667119cc891b351188484ca6fb88973";
29
-
sha256 = "1nha71i16fs7nq2812b5565nbmbsbs3ak5czas6xg1dg5bsvdqh8";
29
+
src = fetchgit {
30
+
url = git://anongit.kde.org/kile.git;
31
+
rev = "d38bc7069667119cc891b351188484ca6fb88973";
32
+
sha256 = "1nha71i16fs7nq2812b5565nbmbsbs3ak5czas6xg1dg5bsvdqh8";
30
33
31
-
};
34
+
};
32
35
33
-
nativeBuildInputs = [
34
-
extra-cmake-modules
35
-
kdoctools
36
-
makeQtWrapper
37
-
];
36
+
nativeBuildInputs = [ ecm kdoctools ];
38
37
39
-
buildInputs = [
40
-
qtscript
41
-
kconfig
42
-
kcrash
43
-
kdbusaddons
44
-
kdelibs4support
45
-
kdoctools
46
-
kguiaddons
47
-
kiconthemes
48
-
kinit
49
-
khtml
50
-
kparts
51
-
ktexteditor
52
-
kwindowsystem
53
-
poppler
54
-
];
55
-
56
-
postInstall = ''
57
-
wrapQtProgram "$out/bin/kile"
58
-
'';
38
+
buildInputs = [
39
+
kconfig
40
+
kcrash
41
+
kdbusaddons
42
+
kdelibs4support
43
+
kdoctools
44
+
kguiaddons
45
+
kiconthemes
46
+
kinit
47
+
khtml
48
+
kparts
49
+
ktexteditor
50
+
kwindowsystem
51
+
poppler
52
+
qtscript
53
+
];
59
54
60
-
meta = {
61
-
description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
62
-
homepage = https://www.kde.org/applications/office/kile/;
63
-
maintainers = with lib.maintainers; [ fridh ];
64
-
license = lib.licenses.gpl2Plus;
65
-
};
55
+
meta = {
56
+
description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
57
+
homepage = https://www.kde.org/applications/office/kile/;
58
+
maintainers = with lib.maintainers; [ fridh ];
59
+
license = lib.licenses.gpl2Plus;
60
+
};
61
+
};
62
+
in
63
+
kdeWrapper unwrapped
64
+
{
65
+
targets = [ "bin/kile" ];
66
+
paths = [ konsole.unwrapped ];
66
67
}
+2
-2
pkgs/desktops/kde-5/applications/dolphin.nix
+2
-2
pkgs/desktops/kde-5/applications/dolphin.nix
···
4
4
baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
5
5
kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
6
6
kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
7
-
kparts, ktexteditor, kwindowsystem, phonon, solid
7
+
konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
8
8
}:
9
9
10
10
let
···
27
27
kdeWrapper unwrapped
28
28
{
29
29
targets = [ "bin/dolphin" ];
30
-
paths = [ dolphin-plugins ];
30
+
paths = [ dolphin-plugins konsole.unwrapped ];
31
31
}
+9
-5
pkgs/desktops/kde-5/applications/kate.nix
+9
-5
pkgs/desktops/kde-5/applications/kate.nix
···
1
1
{
2
2
kdeApp, lib, kdeWrapper,
3
3
ecm, kdoctools,
4
-
kactivities, kconfig, kcrash, kguiaddons, kiconthemes, ki18n, kinit,
5
-
kjobwidgets, kio, kparts, ktexteditor, kwindowsystem, kxmlgui, kdbusaddons,
6
-
kwallet, plasma-framework, kitemmodels, knotifications, qtscript,
7
-
threadweaver, knewstuff, libgit2
4
+
kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
5
+
kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
6
+
kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
7
+
plasma-framework, qtscript, threadweaver
8
8
}:
9
9
10
10
let
···
24
24
];
25
25
};
26
26
in
27
-
kdeWrapper unwrapped { targets = [ "bin/kate" "bin/kwrite" ]; }
27
+
kdeWrapper unwrapped
28
+
{
29
+
targets = [ "bin/kate" "bin/kwrite" ];
30
+
paths = [ konsole.unwrapped ];
31
+
}