public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtcreator: move to qmakeHook

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-04-17 02:50:41 +03:00
parent c161258003
commit a9662f8c45
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/qtcreator/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper { stdenv, fetchurl, makeWrapper
, qtbase, qtquickcontrols, qtscript, qtdeclarative , qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook
, withDocumentation ? false , withDocumentation ? false
}: }:
@ -21,18 +21,15 @@ stdenv.mkDerivation rec {
buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ]; buildInputs = [ makeWrapper qtbase qtscript qtquickcontrols qtdeclarative ];
nativeBuildInputs = [ qmakeHook makeQtWrapper ];
doCheck = false; doCheck = false;
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' buildFlags = optional withDocumentation "docs";
qmake -spec linux-g++ qtcreator.pro
'';
buildFlags = optionalString withDocumentation " docs"; installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
installFlags = "INSTALL_ROOT=$(out)"
+ optionalString withDocumentation " install_docs";
postInstall = '' postInstall = ''
# Install desktop file # Install desktop file
@ -47,13 +44,7 @@ stdenv.mkDerivation rec {
Type=Application Type=Application
Categories=Qt;Development;IDE; Categories=Qt;Development;IDE;
__EOF__ __EOF__
# Wrap the qtcreator binary wrapQtProgram $out/bin/qtcreator
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" \
--prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH"
''; '';
meta = { meta = {