diff options
| author | adisbladis <adis@blad.is> | 2018-01-13 01:43:26 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2018-01-13 04:03:36 +0800 |
| commit | 08ab28b9a32254445e3fcf1b8ccb2bd68071bde4 (patch) | |
| tree | d2e2e24d03316d84842d8173144ebbb603e5d06b /pkgs | |
| parent | 7dea1f20ed5512fd2992ced563e9b355e70afe97 (diff) | |
| download | nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar.gz nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar.bz2 nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar.lz nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar.xz nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.tar.zst nixpkgs-08ab28b9a32254445e3fcf1b8ccb2bd68071bde4.zip | |
qcachegrind: Use kcachegrind src/name attributes
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/analysis/qcachegrind/default.nix | 19 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 10 insertions, 11 deletions
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 395f720906c..8db532d2feb 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -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 ]; @@ -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; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b79a11913c..4ab498ec754 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; |