diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-19 21:45:37 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-20 07:56:53 -0600 |
| commit | 538ce57feb63f93b692ea43f0f52643f6fe99ed6 (patch) | |
| tree | 368baf8282b2c24a996d71358cabc072d56f65c3 /pkgs/development/qtcreator | |
| parent | 1cd5505a9fadac3a1d4b92b1fd78e58f0fa7935a (diff) | |
qtcreator: Qt 5 infrastructure update
Diffstat (limited to 'pkgs/development/qtcreator')
| -rw-r--r-- | pkgs/development/qtcreator/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 4051ac218368..c0647a6df4a5 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -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" \ |