Skip to content

Commit 3fa6afd

Browse files
committedSep 30, 2017
kgraphviewer: 2.2.0 -> 2.4.2
This also moves it from qt4 to qt5/kf5.
1 parent 0bf3f4b commit 3fa6afd

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed
 

Diff for: ‎pkgs/applications/graphics/kgraphviewer/default.nix

+26-12
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,38 @@
1-
{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
2-
, kdelibs4, boost, graphviz
1+
{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook
2+
, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons
3+
, qtbase, qtsvg
4+
, boost, graphviz
35
}:
46

5-
stdenv.mkDerivation rec {
7+
mkDerivation rec {
68
name = "kgraphviewer-${version}";
7-
version = "2.2.0";
9+
version = "2.4.2";
810

911
src = fetchurl {
10-
url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz";
11-
sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5";
12+
url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz";
13+
sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9";
1214
};
1315

14-
buildInputs = [ kdelibs4 boost graphviz ];
15-
nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
16+
buildInputs = [
17+
qtbase qtsvg
18+
boost graphviz
19+
];
20+
21+
nativeBuildInputs = [
22+
cmake extra-cmake-modules pkgconfig wrapGAppsHook
23+
kdoctools
24+
];
25+
26+
propagatedBuildInputs = [
27+
kconfig kinit kio kparts kwidgetsaddons
28+
];
29+
30+
enableParallelBuilding = true;
1631

1732
meta = with stdenv.lib; {
1833
description = "A Graphviz dot graph viewer for KDE";
19-
license = licenses.gpl2;
20-
platforms = platforms.linux;
21-
maintainers = [ maintainers.lethalman ];
34+
license = licenses.gpl2;
35+
maintainers = with maintainers; [ lethalman ];
36+
platforms = platforms.linux;
2237
};
2338
}
24-

Diff for: ‎pkgs/top-level/all-packages.nix

+1-1
Original file line numberDiff line numberDiff line change
@@ -15129,7 +15129,7 @@ with pkgs;
1512915129

1513015130
keymon = callPackage ../applications/video/key-mon { };
1513115131

15132-
kgraphviewer = kde4.callPackage ../applications/graphics/kgraphviewer { };
15132+
kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { };
1513315133

1513415134
khal = callPackage ../applications/misc/khal { };
1513515135

0 commit comments

Comments
 (0)
Please sign in to comment.