diff options
| -rw-r--r-- | pkgs/development/tools/qtcreator/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 9df547308f5..8340891da01 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -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' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2865279cbdd..a3f2cd7b1e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14604,7 +14604,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 {} ; |