public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qtcreator: 4.1.0 -> 4.2.0

Browse Source
This commit is contained in:
Nikolay Amiantov 2016-12-29 22:30:05 +03:00
parent 614ae8f660
commit 9d03fe2dfb
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/qtcreator/default.nix
View File

@ -6,17 +6,17 @@
with stdenv.lib; with stdenv.lib;
let let
baseVersion = "4.1"; baseVersion = "4.2";
revision = "0"; revision = "0";
version = "${baseVersion}.${revision}";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "qtcreator-${version}"; name = "qtcreator-${version}";
version = "${baseVersion}.${revision}";
src = fetchurl { src = fetchurl {
url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz";
sha256 = "00xlzw01ngza54ssmwz2ryahjlrbniy2q3p174xri1pxvcih4b21"; sha256 = "0yzj1i6hkzl9w1g8d5vidz7z6amwpj8p3cfibn9slf1sphxph18f";
}; };
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@ -31,6 +31,10 @@ stdenv.mkDerivation rec {
installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs"; installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
preBuild = optional withDocumentation ''
ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
'';
postInstall = '' postInstall = ''
# Install desktop file # Install desktop file
mkdir -p "$out/share/applications" mkdir -p "$out/share/applications"

4
pkgs/top-level/all-packages.nix
View File

@ -6455,9 +6455,7 @@ in
premake = premake4; premake = premake4;
qtcreator = qt5.callPackage ../development/qtcreator { qtcreator = qt5.callPackage ../development/qtcreator { };
withDocumentation = false; # 'true' is currently broken with qt>=5.5
};
r10k = callPackage ../tools/system/r10k { }; r10k = callPackage ../tools/system/r10k { };