From 22194538d72274f714b346a328d71542e695b3b9 Mon Sep 17 00:00:00 2001
From: bbenoist <return_0@live.com>
Date: Sat, 1 Jun 2013 00:05:29 +0200
Subject: [PATCH] qtcreator: Update to 2.7.1 and improvements (merge #579)

- Qt is now directly overriden in QtCreator's definition.
- qt48Full can be used in a development environment to enable access to
docs demos and examples.

NOTE: It may be required to remove older configuration files located in
~/.config/QtProject and at ~/.config/Trolltech.conf to reconfigure
qtcreator with the correct paths. I have found /nix/store/... paths in the
following files:
$HOME/.config/QtProject/qtcreator/toolchains.xml
$HOME/.config/QtProject/qtcreator/qtversion.xml
$HOME/.config/QtProject/qtcreator/helpcollection.qhc

At the first launch, be sure to check your qtcreator's configuration by
selecting Tools->Options. The most important parts are the Kits and
QtVersion tabs located in the Build & Run section.
---
 pkgs/development/qtcreator/default.nix | 13 +++++++++----
 pkgs/top-level/all-packages.nix        |  8 ++++++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 60ff5ede75a..add0c08e95a 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,15 +1,20 @@
-{ stdenv, fetchurl, qt4_for_qtcreator }:
+{ stdenv, fetchurl, qt48 }:
 
 let
-  version = "2.6.0";
+  baseVersion = "2.7";
+  revision = "1";
+  version = "${baseVersion}.${revision}";
+  qt4_for_qtcreator = qt48.override {
+    developerBuild = true;
+  };
 in
 
 stdenv.mkDerivation rec {
   name = "qtcreator-${version}";
 
   src = fetchurl {
-    url = "http://origin.releases.qt-project.org/qtcreator/${version}/qt-creator-${version}-src.tar.gz";
-    md5 = "9bf01098f84a0fe930b2718d11124204";
+    url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz";
+    sha256 = "04vn7y3dkk9vi1rsmsxby57mvc2h9n5q842hayq2mdlsax4qnhjv";
   };
 
   buildInputs = [ qt4_for_qtcreator ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e948c3a294..4958059171e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4964,8 +4964,12 @@ let
     inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
   };
 
-  qt4_for_qtcreator = qt48.override {
-    developerBuild = true;
+  qt48Full = callPackage ../development/libraries/qt-4.x/4.8 {
+    # GNOME dependencies are not used unless gtkStyle == true
+    inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+    docs = true;
+    demos = true;
+    examples = true;
   };
 
   qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { };