philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge pull request #112227 from Zebreus/qtcreator-update 

qtcreator: 4.11.0 -> 4.14.0
master
Maximilian Bosch 2021-02-12 20:45:16 +01:00 committed by GitHub
parent 81af1b95e2 53ffe1d547
commit 9c12722072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/qtcreator/default.nix
View File

@ -20,12 +20,12 @@ in
mkDerivation rec {
pname = "qtcreator";
version = "4.11.0";
version = "4.14.0";
baseVersion = builtins.concatStringsSep "." (lib.take 2 (builtins.splitVersion version));
src = fetchurl {
url = "http://download.qt-project.org/official_releases/${pname}/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz";
sha256 = "0ibn7bapw7m26nmxl26dns1hnpawfdqk1i1mgg0gjssja8famszg";
sha256 = "07i045mzwbfhwj2jlijhz9xs6ay03qs5dgcw2kzlcr79a69i0h6j";
};
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ] ++
@ -54,16 +54,14 @@ mkDerivation rec {
preConfigure = ''
substituteInPlace src/plugins/plugins.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
substituteInPlace src/libs/libs.pro \
--replace '$$[QT_INSTALL_QML]/QtQuick/Controls' '${qtquickcontrols}/${qtbase.qtQmlPrefix}/QtQuick/Controls'
'' + optionalString withClangPlugins ''
# Fix paths for llvm/clang includes directories.
substituteInPlace src/shared/clang/clang_defines.pri \
--replace '$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include)' '${clang_qt_vendor}/lib/clang/8.0.0/include' \
--replace '$$clean_path($${LLVM_BINDIR})' '${clang_qt_vendor}/bin'
# Fix include path to find clang and clang-c include directories.
substituteInPlace src/plugins/clangtools/clangtools.pro \
--replace 'INCLUDEPATH += $$LLVM_INCLUDEPATH' 'INCLUDEPATH += $$LLVM_INCLUDEPATH ${clang_qt_vendor}'
# Fix paths to libclang library.
substituteInPlace src/shared/clang/clang_installation.pri \
--replace 'LIBCLANG_LIBS = -L$${LLVM_LIBDIR}' 'LIBCLANG_LIBS = -L${llvmPackages_8.libclang}/lib' \

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

@ -12661,7 +12661,7 @@ in
pyrseas = callPackage ../development/tools/database/pyrseas { };
qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { };
qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ;