pyrox.dev / nixpkgs
lol
fork atom

qtcreator: Qt 5 infrastructure update

Thomas Tuegel 538ce57f 1cd5505a

+12 -9
unified split
+7 -4
pkgs/development/qtcreator/default.nix
··· 1 - { stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }: 1 + { stdenv, fetchurl, makeWrapper 2 + , qtbase, qtquickcontrols, qtscript, qtdeclarative 3 + , withDocumentation ? false 4 + }: 2 5 3 6 with stdenv.lib; 4 7 ··· 16 19 sha256 = "0r9ysq9hzig4ag9m8pcpw1jng2fqqns8zwp0jj893gh8ia0sq9ar"; 17 20 }; 18 21 19 - buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ]; 22 + buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ]; 20 23 21 24 doCheck = false; 22 25 ··· 45 48 Categories=Qt;Development;IDE; 46 49 __EOF__ 47 50 # Wrap the qtcreator binary 48 - addToSearchPath QML2_IMPORT_PATH "${qtLib.quickcontrols}/lib/qt5/qml" 49 - addToSearchPath QML2_IMPORT_PATH "${qtLib.declarative}/lib/qt5/qml" 51 + addToSearchPath QML2_IMPORT_PATH "${qtquickcontrols}/lib/qt5/qml" 52 + addToSearchPath QML2_IMPORT_PATH "${qtdeclarative}/lib/qt5/qml" 50 53 wrapProgram $out/bin/qtcreator \ 51 54 --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ 52 55 --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+5 -5
pkgs/top-level/all-packages.nix
··· 8181 8181 8182 8182 qmltermwidget = callPackage ../development/libraries/qmltermwidget { }; 8183 8183 8184 + qtcreator = callPackage ../development/qtcreator { 8185 + withDocumentation = true; 8186 + }; 8187 + 8184 8188 qwt = callPackage ../development/libraries/qwt/6.nix { }; 8185 8189 8186 8190 signon = callPackage ../development/libraries/signon { }; ··· 8196 8200 8197 8201 qtEnv = qt5.env; 8198 8202 qt5Full = qt5.full; 8199 - 8200 - qtcreator = callPackage ../development/qtcreator { 8201 - qtLib = qt54; 8202 - withDocumentation = true; 8203 - }; 8204 8203 8205 8204 qtkeychain = callPackage ../development/libraries/qtkeychain { }; 8206 8205 ··· 15802 15801 phonon_qt5_backend_gstreamer = qt5.phonon_backend_gstreamer; # added 2015-12-19 15803 15802 poppler_qt5 = qt5.poppler; # added 2015-12-19 15804 15803 qca-qt5 = qt5.qca-qt5; # added 2015-12-19 15804 + qtcreator = qt5.qtcreator; # added 2015-12-19 15805 15805 quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30 15806 15806 quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30 15807 15807 quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30