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 { };