Skip to content

Commit

Permalink
qcachegrind: Use kcachegrind src/name attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
adisbladis committed Jan 12, 2018
1 parent 7dea1f2 commit 08ab28b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 11 deletions.
19 changes: 9 additions & 10 deletions pkgs/development/tools/analysis/qcachegrind/default.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }:
{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php, kcachegrind }:

stdenv.mkDerivation rec {
name = "qcachegrind-${version}";
version = "16.12.3";
let
name = stdenv.lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name;

src = fetchurl {
url = "http://download.kde.org/stable/applications/${version}/src/kcachegrind-${version}.tar.xz";
sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
};
in stdenv.mkDerivation rec {
inherit name;

src = kcachegrind.src;

buildInputs = [ qtbase perl python php ];

Expand All @@ -28,8 +27,8 @@ stdenv.mkDerivation rec {
'' else ''
install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
install -Dm644 kcachegrind/32-apps-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
install -Dm644 kcachegrind/48-apps-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
'');

meta = with stdenv.lib; {
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7925,7 +7925,7 @@ with pkgs;

valkyrie = callPackage ../development/tools/analysis/valkyrie { };

qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {};
qcachegrind = libsForQt5.callPackage ../development/tools/analysis/qcachegrind {};

verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
coq = coq_8_4;
Expand Down

0 comments on commit 08ab28b

Please sign in to comment.