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

qtcreator: 17.0.2 -> 18.0.0

Browse Source 
Change src repo to github (for go module), build CmdBridge Go module
before building project.
This commit is contained in:
mourogurt
2025-11-13 22:26:40 +03:00
parent 10713ba3fb
commit 8c9abcdb03
1 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,10 +2,10 @@
stdenv, stdenv,
lib, lib,
fetchurl, fetchurl,
fetchpatch,
cmake, cmake,
pkg-config, pkg-config,
ninja, ninja,
go,
python3, python3,
qtbase, qtbase,
qt5compat, qt5compat,
@@ -29,24 +29,30 @@
elfutils, elfutils,
perf, perf,
callPackage, callPackage,
buildGoModule,
}: }:
let
stdenv.mkDerivation (finalAttrs: {
pname = "qtcreator"; pname = "qtcreator";
version = "17.0.2"; version = "18.0.0";
src = fetchurl { src = fetchurl {
url = "mirror://qt/official_releases/${finalAttrs.pname}/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.version}/qt-creator-opensource-src-${finalAttrs.version}.tar.xz"; url = "mirror://qt/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz";
hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM="; hash = "sha256-x3O3QRTR+8pmyBuPt5mJKCfn4VQkke1FmqrSeeAlOXM=";
}; };
goModules =
patches = [ (buildGoModule {
# QmlDesigner: Compile fixes for Qt 6.10 private API changes pname = "gocmdbridge";
(fetchpatch { version = "1.0.0";
url = "https://github.com/qt-creator/qt-creator/commit/5a4c700ccefc76c7c531c834734e6fefa14b5364.patch"; inherit src;
hash = "sha256-BnS0HOqP5b7ZsVtuRpCK+TtoJj0yhodDuVtp+C3btIA="; vendorHash = "sha256-PUMQdVlf6evLjzs263SAecIA3aMuMbjIr1xEztiwmro=";
}) setSourceRoot = ''
]; sourceRoot=$(echo */src/libs/gocmdbridge/server)
'';
}).goModules;
in
stdenv.mkDerivation {
inherit pname;
inherit version;
inherit src;
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
@@ -55,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
wrapQtAppsHook wrapQtAppsHook
python3 python3
ninja ninja
go
]; ];
buildInputs = [ buildInputs = [
@@ -96,8 +103,15 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "BUILD_QBS" false) (lib.cmakeBool "BUILD_QBS" false)
(lib.cmakeBool "QTC_CLANG_BUILDMODE_MATCH" true) (lib.cmakeBool "QTC_CLANG_BUILDMODE_MATCH" true)
(lib.cmakeBool "CLANGTOOLING_LINK_CLANG_DYLIB" true) (lib.cmakeBool "CLANGTOOLING_LINK_CLANG_DYLIB" true)
(lib.cmakeBool "CMDBRIDGE_BUILD_VENDOR_MODE" true)
]; ];
preConfigure = ''
export GOCACHE=$TMPDIR/go-cache
export GOPATH="$TMPDIR/go"
cp -r --reflink=auto ${goModules} src/libs/gocmdbridge/server/vendor
'';
qtWrapperArgs = [ qtWrapperArgs = [
"--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin" "--set-default PERFPROFILER_PARSER_FILEPATH ${lib.getBin perf}/bin"
]; ];
@@ -134,4 +148,4 @@ stdenv.mkDerivation (finalAttrs: {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
mainProgram = "qtcreator"; mainProgram = "qtcreator";
}; };
}) }