BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #139938 from Artturin/qtcreatorelfutils

Browse source
This commit is contained in:
Sandro 2021-09-29 23:56:24 +02:00 committed by GitHub
commit d920c1463c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/tools/qtcreator/default.nix
View file

@ -1,5 +1,5 @@
{ mkDerivation, lib, fetchurl, fetchgit, fetchpatch
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8
, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake, llvmPackages_8, elfutils, perf
, withDocumentation ? false, withClangPlugins ? true
}:
@ -28,7 +28,7 @@ mkDerivation rec {
sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative elfutils.dev ] ++
optionals withClangPlugins [ llvmPackages_8.libclang
clang_qt_vendor
llvmPackages_8.llvm ];
@ -49,6 +49,8 @@ mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
qtWrapperArgs = [ "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" ];
preConfigure = ''
substituteInPlace src/plugins/plugins.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'

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

@ -14625,7 +14625,9 @@ with pkgs;
pycritty = with python3Packages; toPythonApplication pycritty;
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator {
inherit (linuxPackages) perf;
};
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;