git.iko.soy/typeable/nixpkgs
on master help sign in
qtcreator: 4.1.0 -> 4.2.0
commit9d03fe2dfbdc68e0d5b72f27226536796004a4fa authorNikolay Amiantov <ab@fmap.me> dateThu 29 Dec 2016, 22:30 (10 years ago) parent614ae8f
2 files changed+8−6
pkgs/development/qtcreator/default.nix+7−3 pkgs/top-level/all-packages.nix+1−3
pkgs/development/qtcreator/default.nix+7−3
@@ -6,17 +6,17 @@
66with stdenv.lib;
77
88let
9− baseVersion = "4.1";
9+ baseVersion = "4.2";
1010 revision = "0";
11− version = "${baseVersion}.${revision}";
1211in
1312
1413stdenv.mkDerivation rec {
1514 name = "qtcreator-${version}";
15+ version = "${baseVersion}.${revision}";
1616
1717 src = fetchurl {
1818 url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
19− sha256 = "00xlzw01ngza54ssmwz2ryahjlrbniy2q3p174xri1pxvcih4b21";
19+ sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f";
2020 };
2121
2222 buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
3131
3232 installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
3333
34+ preBuild = optional withDocumentation ''
35+ ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
36+ '';
37+
3438 postInstall = ''
3539 # Install desktop file
3640 mkdir -p "$out/share/applications"
pkgs/top-level/all-packages.nix+1−3
@@ -6455,9 +6455,7 @@ in
64556455
64566456 premake = premake4;
64576457
6458− qtcreator = qt5.callPackage ../development/qtcreator {
6459− withDocumentation = false; # 'true' is currently broken with qt>=5.5
6460− };
6458+ qtcreator = qt5.callPackage ../development/qtcreator { };
64616459
64626460 r10k = callPackage ../tools/system/r10k { };
64636461