diff options
author | Jos van den Oever <jos@vandenoever.info> | 2014-05-14 17:46:33 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-11 21:30:21 +0200 |
commit | 845b0e3ebc2b6e5ac30ed7f4c26405168aedc5f6 (patch) | |
tree | 8ad2d641d072d4b59e8564319d46415b7681ad38 | |
parent | 8d309c37a7933a56e5d5f70ada154a332a624015 (diff) |
qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.
Close #2643.
Testing parallel build of qt5: fine on @vcunat's 8-core (just this single task).
We'll see on Hydra.
-rw-r--r-- | pkgs/development/libraries/qt-5/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch | 16 | ||||
-rw-r--r-- | pkgs/development/qtcreator/default.nix | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index be028e89ce84..d33c7e0329fe 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -17,7 +17,7 @@ with stdenv.lib; let - v_maj = "5.1"; + v_maj = "5.2"; v_min = "1"; ver = "${v_maj}.${v_min}"; in @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; - sha256 = "4c05742db52325e96b1d610a2388140dcc1e3d03d93faea2b2d3791015b186f6"; + sha256 = "18bxrnyis7xbhpxpf7w42i54hs4qr062b1wx4c0dpmja3lc29sc4"; }; # The version property must be kept because it will be included into the QtSDK package name @@ -151,7 +151,7 @@ stdenv.mkDerivation rec { sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri ''; - #enableParallelBuilding = true; # often fails on Hydra, as well as qt4 + enableParallelBuilding = true; # often fails on Hydra, as well as qt4 meta = { homepage = http://qt-project.org; diff --git a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch index 65b817a2b141..3163e235d02c 100644 --- a/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch +++ b/pkgs/development/libraries/qt-5/dlopen-absolute-paths.patch @@ -1,15 +1,15 @@ diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp --- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 +++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 -@@ -93,7 +93,7 @@ - static void resolveLibrary() - { - #if !defined(QT_NO_LIBRARY) && !defined(Q_OS_QNX) -- QLibrary lib(QLatin1String("resolv")); -+ QLibrary lib(QLatin1String("@glibc@/lib/libresolv")); +@@ -103,7 +103,7 @@ if (!lib.load()) - return; - + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp --- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 +++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index b12f81db9c4c..2b0410f0874e 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -3,8 +3,8 @@ with stdenv.lib; let - baseVersion = "2.8"; - revision = "1"; + baseVersion = "3.1"; + revision = "0"; version = "${baseVersion}.${revision}"; in @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { + optionalString sdkBuild "-qt-${qtLib.version}"; src = fetchurl { - url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-${version}-src.tar.gz"; - sha256 = "d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9"; + url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; + sha256 = "c8c648f4988b707393e0f1958a8868718f27e59263f05f3b6599fa62290c2bbf"; }; # This property can be used in a nix development environment to refer to the Qt package |