MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

qtcreator: Qt 5 infrastructure update

Browse source
This commit is contained in:
Thomas Tuegel 2015-12-19 21:45:37 -06:00
parent 1cd5505a9f
commit 538ce57feb
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/qtcreator/default.nix
View file

@ -1,4 +1,7 @@
{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }:
{ stdenv, fetchurl, makeWrapper
, qtbase, qtquickcontrols, qtscript, qtdeclarative
, withDocumentation ? false
}:
with stdenv.lib;
@ -16,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "0r9ysq9hzig4ag9m8pcpw1jng2fqqns8zwp0jj893gh8ia0sq9ar";
};
buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ];
buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ];
doCheck = false;
@ -45,8 +48,8 @@ stdenv.mkDerivation rec {
Categories=Qt;Development;IDE;
__EOF__
# Wrap the qtcreator binary
addToSearchPath QML2_IMPORT_PATH "${qtLib.quickcontrols}/lib/qt5/qml"
addToSearchPath QML2_IMPORT_PATH "${qtLib.declarative}/lib/qt5/qml"
addToSearchPath QML2_IMPORT_PATH "${qtquickcontrols}/lib/qt5/qml"
addToSearchPath QML2_IMPORT_PATH "${qtdeclarative}/lib/qt5/qml"
wrapProgram $out/bin/qtcreator \
--prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
--prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \

10
pkgs/top-level/all-packages.nix
View file

@ -8181,6 +8181,10 @@ let
qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
qtcreator = callPackage ../development/qtcreator {
withDocumentation = true;
};
qwt = callPackage ../development/libraries/qwt/6.nix { };
signon = callPackage ../development/libraries/signon { };
@ -8197,11 +8201,6 @@ let
qtEnv = qt5.env;
qt5Full = qt5.full;
qtcreator = callPackage ../development/qtcreator {
qtLib = qt54;
withDocumentation = true;
};
qtkeychain = callPackage ../development/libraries/qtkeychain { };
qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };
@ -15802,6 +15801,7 @@ aliases = with self; rec {
phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19
poppler_qt5 = qt5.poppler; # added 2015-12-19
qca-qt5 = qt5.qca-qt5; # added 2015-12-19
qtcreator = qt5.qtcreator; # added 2015-12-19
quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30
quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30
quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30