diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-24 12:28:29 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-03-25 08:49:36 -0500 |
| commit | 22300a9d77aaa266a2ba21c5fed1d48ae670e350 (patch) | |
| tree | b06c1df6c0dffbc90826ba42173b7fafa133c01b | |
| parent | a9172891d964c03a9d833cf0c5cf861ebaad9d35 (diff) | |
| download | nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar.gz nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar.bz2 nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar.lz nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar.xz nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.tar.zst nixlib-22300a9d77aaa266a2ba21c5fed1d48ae670e350.zip | |
qcachegrind: pin to Qt 5.6 and correct packaging errors
| -rw-r--r-- | pkgs/development/tools/analysis/qcachegrind/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 865b3ad6797d..64bb39aaf45d 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt, qmakeHook, makeQtWrapper, perl, python, php }: +{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }: stdenv.mkDerivation rec { name = "qcachegrind-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q"; }; - buildInputs = [ qt.qtbase perl python php ]; + buildInputs = [ qtbase perl python php ]; nativeBuildInputs = [ qmakeHook makeQtWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 217137c210f2..51dd9d3f5619 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6955,9 +6955,7 @@ with pkgs; valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - qcachegrind = libsForQt57.callPackage ../development/tools/analysis/qcachegrind { - qt = qt57; - }; + qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {}; verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { coq = coq_8_4; |