diff options
-rw-r--r-- | lib/maintainers.nix | 1 | ||||
-rw-r--r-- | pkgs/development/qtcreator/default.nix | 27 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 13 |
3 files changed, 13 insertions, 28 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8383277a0b3d..4ad066b75997 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ aflatter = "Alexander Flatter <flatter@fastmail.fm>"; aherrmann = "Andreas Herrmann <andreash87@gmx.ch>"; ak = "Alexander Kjeldaas <ak@formalprivacy.com>"; + akaWolf = "Artjom Vejsel <akawolf0@gmail.com>"; akc = "Anders Claesson <akc@akc.is>"; algorith = "Dries Van Daele <dries_van_daele@telenet.be>"; all = "Nix Committers <nix-commits@lists.science.uu.nl>"; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 199df25d5523..0f55d4ee9af6 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: +{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }: with stdenv.lib; @@ -9,31 +9,21 @@ let in stdenv.mkDerivation rec { - # The package name depends on wether we are just building the QtCreator package or the whole Qt SDK - # If we are building the QtCreator package: qtcreator-version - # If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version - name = "qt${if sdkBuild then "sdk" else "creator"}-${version}" - + optionalString sdkBuild "-qt-${qtLib.version}"; + name = "qtcreator-${version}"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm"; }; - # This property can be used in a nix development environment to refer to the Qt package - # eg: export QTDIR=${qtSDK.qt} - qt = qtLib; - - # We must only propagate Qt (including qmake) when building the QtSDK - propagatedBuildInputs = if sdkBuild then [ qtLib ] else []; - buildInputs = if sdkBuild == false then [ qtLib ] else []; + buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ]; doCheck = false; enableParallelBuilding = true; preConfigure = '' - qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro + qmake -spec linux-g++ qtcreator.pro ''; buildFlags = optionalString withDocumentation " docs"; @@ -54,6 +44,11 @@ stdenv.mkDerivation rec { Type=Application Categories=Qt;Development;IDE; __EOF__ + # Wrap the qtcreator binary + wrapProgram $out/bin/qtcreator \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" ''; meta = { @@ -63,9 +58,9 @@ stdenv.mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; + homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.bbenoist ]; + maintainers = [ maintainers.akaWolf maintainers.bbenoist ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1abac46ab6b8..b101735627bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7977,11 +7977,6 @@ let developerBuild = true; }); - qt4SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt48Full; - }; - qt53 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; @@ -8001,14 +7996,8 @@ let paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); }); - qt5SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt5Full; - withDocumentation = true; - }; - qtcreator = callPackage ../development/qtcreator { - qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 + qtLib = qt54; withDocumentation = true; }; |