From 40d9ebd969f9dceb32375e88f17c1c2cb161d49a Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 7 Oct 2017 15:06:13 -0800 Subject: [PATCH] massif-visualizer: 0.4.0 -> 0.7.0 --- .../analysis/massif-visualizer/default.nix | 26 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix index f3195a23f883..99958a416c39 100644 --- a/pkgs/development/tools/analysis/massif-visualizer/default.nix +++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix @@ -1,22 +1,30 @@ -{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig -, kdelibs4, kgraphviewer }: +{ + mkDerivation, lib, fetchurl, + extra-cmake-modules, shared_mime_info, + qtsvg, qtxmlpatterns, karchive, kconfig, kcoreaddons, kparts, kio, ki18n, + kdiagram, kgraphviewer +}: -stdenv.mkDerivation rec { +mkDerivation rec { name = "massif-visualizer-${version}"; - version = "0.4.0"; + version = "0.7.0"; src = fetchurl { url = "mirror://kde/stable/massif-visualizer/${version}/src/${name}.tar.xz"; - sha256 = "0yawzp5lw7ryjcpqkhz70q4hc5hwq5imq5lgqnwgss057zcln7z8"; + sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q"; }; - nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ]; - buildInputs = [ kdelibs4 kgraphviewer ]; + nativeBuildInputs = [ extra-cmake-modules shared_mime_info ]; - meta = with stdenv.lib; { + buildInputs = [ + qtsvg qtxmlpatterns karchive kconfig kcoreaddons kparts kio ki18n + kdiagram kgraphviewer + ]; + + meta = with lib; { description = "Tool that visualizes massif data generated by valgrind"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = with maintainers; [ lethalman zraexy ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 833becfccf91..70ac51d3467a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7347,7 +7347,7 @@ with pkgs; lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = kde4.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { };