qtcreator: Qt 5 infrastructure update

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

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" \