From 876b1c1cac74f5c247c29e91a012fc8315f604dd Mon Sep 17 00:00:00 2001 From: Baptist BENOIST Date: Tue, 27 Nov 2012 13:54:44 +0100 Subject: [PATCH] qtcreator: Build QmlDesigner Plugin Building of this plugin required qt's private headers. See http://qt.gitorious.org/qt-creator/qt-creator/blobs/master/README for more. --- pkgs/development/qtcreator/default.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 2713070ecb4c..60ff5ede75a0 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4 }: +{ stdenv, fetchurl, qt4_for_qtcreator }: let version = "2.6.0"; @@ -12,13 +12,16 @@ stdenv.mkDerivation rec { md5 = "9bf01098f84a0fe930b2718d11124204"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt4_for_qtcreator ]; doCheck = false; enableParallelBuilding = true; - preConfigure = "qmake"; + preConfigure = '' + qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qt4_for_qtcreator}/include" qtcreator.pro + ''; + installFlags = "INSTALL_ROOT=$(out)"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5945703c6c9..df5b806de85c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4795,6 +4795,10 @@ let gst_plugins_base = null; }; + qt4_for_qtcreator = qt48.override { + developerBuild = true; + }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { };