public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qcachegrind: pin to Qt 5.6 and correct packaging errors

Browse Source
This commit is contained in:
Thomas Tuegel 2017-03-24 12:28:29 -05:00
parent a9172891d9
commit 22300a9d77
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/analysis/qcachegrind/default.nix
View File

@ -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 { stdenv.mkDerivation rec {
name = "qcachegrind-${version}"; name = "qcachegrind-${version}";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q"; sha256 = "109y94nz96izzsjjdpj9c6g344rcr86srp5w0433mssbyvym4x7q";
}; };
buildInputs = [ qt.qtbase perl python php ]; buildInputs = [ qtbase perl python php ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ]; nativeBuildInputs = [ qmakeHook makeQtWrapper ];

4
pkgs/top-level/all-packages.nix
View File

@ -6955,9 +6955,7 @@ with pkgs;
valkyrie = callPackage ../development/tools/analysis/valkyrie { }; valkyrie = callPackage ../development/tools/analysis/valkyrie { };
qcachegrind = libsForQt57.callPackage ../development/tools/analysis/qcachegrind { qcachegrind = libsForQt56.callPackage ../development/tools/analysis/qcachegrind {};
qt = qt57;
};
verasco = ocaml-ng.ocamlPackages_4_02.verasco.override { verasco = ocaml-ng.ocamlPackages_4_02.verasco.override {
coq = coq_8_4; coq = coq_8_4;