diff options
| author | José Romildo Malaquias <malaquias@gmail.com> | 2017-06-18 06:36:41 -0300 |
|---|---|---|
| committer | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-06-18 10:36:41 +0100 |
| commit | 78b34f913be0c4a4c6bf83736908c10ce14e9f39 (patch) | |
| tree | d7018459b4891cca36d89f85d29b5b45e3c443ee /pkgs | |
| parent | 3a15cdea6fd4dace6c98b2e3b20f52f435b872e9 (diff) | |
qtcreator: 4.2.1 -> 4.3.0 (#26627)
* 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
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/qtcreator/default.nix | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index f66070be6944a..6fadf530ed00f 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -6,8 +6,8 @@ with stdenv.lib; let - baseVersion = "4.2"; - revision = "1"; + baseVersion = "4.3"; + revision = "0"; in stdenv.mkDerivation rec { @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { version = "${baseVersion}.${revision}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; - sha256 = "0f2slaf579q2anflf524lbhmpwrwy3hzjfxzs10n44r7s7yc4dr5"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.xz"; + sha256 = "1n3ihky72p6q69n6c8s5hacq8rxdqmmr6msg89w5amwd17sam7p9"; }; buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ]; @@ -36,18 +36,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - # Install desktop file - mkdir -p "$out/share/applications" - 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__ + substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \ + --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator" wrapQtProgram $out/bin/qtcreator ''; |