summary refs log tree commit diff
path: root/pkgs/development/qtcreator
diff options
context:
space:
mode:
authorbbenoist <return_0@live.com>2013-06-01 00:05:29 +0200
committerVladimír Čunát <vcunat@gmail.com>2013-06-01 12:53:17 +0200
commit22194538d72274f714b346a328d71542e695b3b9 (patch)
treed8692f0a5f38b6c20762a95d4b18055d725c3b8c /pkgs/development/qtcreator
parent0c6e22adbab989b6e9f25edb9baf3267664112ff (diff)
downloadnixlib-22194538d72274f714b346a328d71542e695b3b9.tar
nixlib-22194538d72274f714b346a328d71542e695b3b9.tar.gz
nixlib-22194538d72274f714b346a328d71542e695b3b9.tar.bz2
nixlib-22194538d72274f714b346a328d71542e695b3b9.tar.lz
nixlib-22194538d72274f714b346a328d71542e695b3b9.tar.xz
nixlib-22194538d72274f714b346a328d71542e695b3b9.tar.zst
nixlib-22194538d72274f714b346a328d71542e695b3b9.zip
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.
Diffstat (limited to 'pkgs/development/qtcreator')
-rw-r--r--pkgs/development/qtcreator/default.nix13
1 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 60ff5ede75a0..add0c08e95ae 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 ];