diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-02-12 20:45:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-12 20:45:16 +0100 |
| commit | 9c12722072b99f8aeed348e5c3ae394e77fdef75 (patch) | |
| tree | 1a2ddd278a3ee1eed4901380c8041628ee7a02ad /pkgs | |
| parent | 81af1b95e260efe4135b88718b2f05b0535420f8 (diff) | |
| parent | 53ffe1d547235fa8087ba6e444fa2c61bf74886b (diff) | |
| download | nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar.gz nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar.bz2 nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar.lz nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar.xz nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.tar.zst nixlib-9c12722072b99f8aeed348e5c3ae394e77fdef75.zip | |
Merge pull request #112227 from Zebreus/qtcreator-update
qtcreator: 4.11.0 -> 4.14.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/qtcreator/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix index 40e3e42d84cc..dc5699ed3739 100644 --- a/pkgs/development/tools/qtcreator/default.nix +++ b/pkgs/development/tools/qtcreator/default.nix @@ -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' \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2189090774a..b20cca4406fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {} ; |