From 3fa6afdb35c94a02d6f5a01fb1c8927814877fac Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 14 Sep 2017 12:18:21 +0800 Subject: [PATCH] kgraphviewer: 2.2.0 -> 2.4.2 This also moves it from qt4 to qt5/kf5. --- .../graphics/kgraphviewer/default.nix | 38 +++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/kgraphviewer/default.nix b/pkgs/applications/graphics/kgraphviewer/default.nix index 6c2be6ea73c..8f043816ba0 100644 --- a/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/pkgs/applications/graphics/kgraphviewer/default.nix @@ -1,24 +1,38 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs4, boost, graphviz +{ stdenv, mkDerivation, fetchurl, cmake, extra-cmake-modules, pkgconfig, wrapGAppsHook +, kconfig, kcrash, kinit, kdoctools, kiconthemes, kio, kparts, kwidgetsaddons +, qtbase, qtsvg +, boost, graphviz }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "kgraphviewer-${version}"; - version = "2.2.0"; + version = "2.4.2"; src = fetchurl { - url = "mirror://kde/stable/kgraphviewer/${version}/src/${name}.tar.xz"; - sha256 = "1vs5x539mx26xqdljwzkh2bj7s3ydw4cb1wm9nlhgs18siw4gjl5"; + url = "mirror://kde/stable/kgraphviewer/${version}/${name}.tar.xz"; + sha256 = "1jc5zfgy4narwgn7rscfwz7l5pjy0jghal6yb3kd4sfadi78nhs9"; }; - buildInputs = [ kdelibs4 boost graphviz ]; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; + buildInputs = [ + qtbase qtsvg + boost graphviz + ]; + + nativeBuildInputs = [ + cmake extra-cmake-modules pkgconfig wrapGAppsHook + kdoctools + ]; + + propagatedBuildInputs = [ + kconfig kinit kio kparts kwidgetsaddons + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "A Graphviz dot graph viewer for KDE"; - license = licenses.gpl2; - platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + license = licenses.gpl2; + maintainers = with maintainers; [ lethalman ]; + platforms = platforms.linux; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1dde24741b..03a4a5fa53e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15129,7 +15129,7 @@ with pkgs; keymon = callPackage ../applications/video/key-mon { }; - kgraphviewer = kde4.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { };