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

qtcreator: 4.2.1 -> 4.3.0 (#26627)

Browse Source 
* qtcreator: 4.2.1 -> 4.3.0

Update qtcreator to version 4.3.0.

Remove explicit creation and installation of a desktop file, since one
is already provided in the distribution package.

* qtcreator: use full executable path in the desktop file
This commit is contained in:
José Romildo Malaquias 2017-06-18 06:36:41 -03:00 committed by Jörg Thalheim
parent 3a15cdea6f
commit 78b34f913b
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,8 +6,8 @@
with stdenv.lib; with stdenv.lib;
let let
baseVersion = "4.2"; baseVersion = "4.3";
revision = "1"; revision = "0";
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
version = "${baseVersion}.${revision}"; 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.xz";
sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5"; sha256 = "1n3ihky72p6q69n6c8s5hacq8rxdqmmr6msg89w5amwd17sam7p9";
}; };
buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
@ -36,18 +36,8 @@ stdenv.mkDerivation rec {
''; '';
postInstall = '' postInstall = ''
# Install desktop file substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
mkdir -p "$out/share/applications" --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
cat > "$out/share/applications/qtcreator.desktop" << __EOF__
[Desktop Entry]
Exec=$out/bin/qtcreator
Name=Qt Creator
GenericName=Cross-platform IDE for Qt
Icon=QtProject-qtcreator.png
Terminal=false
Type=Application
Categories=Qt;Development;IDE;
__EOF__
wrapQtProgram $out/bin/qtcreator wrapQtProgram $out/bin/qtcreator
''; '';