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

Merge pull request #16092 from abbradar/qt561

Browse Source 
Qt: 5.6.0 -> 5.6.1
This commit is contained in:
Thomas Tuegel 2016-06-09 14:32:53 -05:00 committed by GitHub
commit e6fdc9f7f0
18 changed files with 334 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
View File

@ -10,10 +10,11 @@
let let
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
packagedQt = "5.6.0";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "telegram-desktop-${version}"; name = "telegram-desktop-${version}";
version = "0.9.49"; version = "0.9.49";
qtVersion = lib.replaceStrings ["."] ["_"] qtbase.version; qtVersion = lib.replaceStrings ["."] ["_"] packagedQt;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "telegramdesktop"; owner = "telegramdesktop";
@ -63,7 +64,7 @@ in stdenv.mkDerivation rec {
"LIBS+=-lssl" "LIBS+=-lssl"
]; ];
qtSrcs = qtbase.srcs ++ [ qtimageformats.src ]; qtSrcs = [ qtbase.src qtimageformats.src ];
qtPatches = qtbase.patches; qtPatches = qtbase.patches;
buildCommand = '' buildCommand = ''
@ -79,7 +80,8 @@ in stdenv.mkDerivation rec {
-e 's,LIBS += .*libz.a,LIBS += -lz,' \ -e 's,LIBS += .*libz.a,LIBS += -lz,' \
-e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \ -e 's,LIBS += .*libbreakpad_client.a,LIBS += ${breakpad}/lib/libbreakpad_client.a,' \
-e 's, -flto,,g' \ -e 's, -flto,,g' \
-e 's, -static-libstdc++,,g' -e 's, -static-libstdc++,,g' \
-e 's,${packagedQt},${qtbase.version},g'
export QMAKE=$PWD/../qt/bin/qmake export QMAKE=$PWD/../qt/bin/qmake
( mkdir -p ../Libraries ( mkdir -p ../Libraries
@ -87,18 +89,15 @@ in stdenv.mkDerivation rec {
for i in $qtSrcs; do for i in $qtSrcs; do
tar -xaf $i tar -xaf $i
done done
mv qt-everywhere-opensource-src-* QtStatic cd qtbase-*
mv qtbase-opensource-src-* ./QtStatic/qtbase patch -p1 < ../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff
mv qtimageformats-opensource-src-* ./QtStatic/qtimageformats
cd QtStatic/qtbase
patch -p1 < ../../../$sourceRoot/Telegram/Patches/qtbase_${qtVersion}.diff
cd ..
for i in $qtPatches; do for i in $qtPatches; do
patch -p1 < $i patch -p1 < $i
done done
${qtbase.postPatch} ${qtbase.postPatch}
cd ..
export configureFlags="-prefix "$PWD/../../qt" -release -opensource -confirm-license -system-zlib \ export configureFlags="-prefix "$PWD/../qt" -release -opensource -confirm-license -system-zlib \
-system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \ -system-libpng -system-libjpeg -system-freetype -system-harfbuzz -system-pcre -system-xcb \
-system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \ -system-xkbcommon-x11 -no-opengl -static -nomake examples -nomake tests \
-openssl-linked -dbus-linked -system-sqlite -verbose \ -openssl-linked -dbus-linked -system-sqlite -verbose \
@ -107,13 +106,13 @@ in stdenv.mkDerivation rec {
export dontAddPrefix=1 export dontAddPrefix=1
export MAKEFLAGS=-j$NIX_BUILD_CORES export MAKEFLAGS=-j$NIX_BUILD_CORES
( cd qtbase ( cd qtbase-*
configurePhase configurePhase
buildPhase buildPhase
make install make install
) )
( cd qtimageformats ( cd qtimageformats-*
$QMAKE $QMAKE
buildPhase buildPhase
make install make install

4
pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
View File

@ -4,7 +4,7 @@
set -x set -x
# The trailing slash at the end is necessary! # The trailing slash at the end is necessary!
RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/" RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.1/submodules/"
EXTRA_WGET_ARGS='-A *.tar.xz' EXTRA_WGET_ARGS='-A *.tar.xz'
mkdir tmp; cd tmp mkdir tmp; cd tmp
@ -12,7 +12,7 @@ mkdir tmp; cd tmp
wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
cat >../srcs.nix <<EOF cat >../srcs.nix <<EOF
# DO NOT EDIT! This file is generated automatically by manifest.sh # DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }: { fetchurl, mirror }:
{ {

42
pkgs/development/libraries/qt-5/5.6/qtbase/cmake-paths.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in Index: qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in --- qtbase-opensource-src-5.6.0.orig/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ qtbase-opensource-src-5.6.0/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) @@ -9,30 +9,6 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0)
endif() endif()
!!ENDIF !!ENDIF
@ -182,10 +182,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/mkspecs/features/data/cmake/Qt5
!!ELSE !!ELSE
set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in Index: qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/gui/Qt5GuiConfigExtras.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in +++ qtbase-opensource-src-5.6.0/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
!!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
@ -211,10 +211,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/gui/Qt5GuiConfigExtras.cmak
!!ELSE !!ELSE
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in Index: qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExtras.cmake.in +++ qtbase-opensource-src-5.6.0/src/widgets/Qt5WidgetsConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
add_executable(Qt5::uic IMPORTED) add_executable(Qt5::uic IMPORTED)
@ -224,10 +224,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/widgets/Qt5WidgetsConfigExt
!!ELSE !!ELSE
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras.cmake.in +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
add_executable(Qt5::qmake IMPORTED) add_executable(Qt5::qmake IMPORTED)
@ -273,10 +273,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
!!ELSE !!ELSE
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
!!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE)
@ -285,10 +285,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
!!ELSE !!ELSE
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in Index: qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +++ qtbase-opensource-src-5.6.0/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
!!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE)
@ -297,10 +297,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/Qt5CoreConfigExtras
!!ELSE !!ELSE
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF !!ENDIF
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in Index: qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in --- qtbase-opensource-src-5.6.0.orig/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/dbus/Qt5DBusConfigExtras.cmake.in +++ qtbase-opensource-src-5.6.0/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml) @@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qdbuscpp2xml)
add_executable(Qt5::qdbuscpp2xml IMPORTED) add_executable(Qt5::qdbuscpp2xml IMPORTED)

6
pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp Index: qtbase-opensource-src-5.6.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp --- qtbase-opensource-src-5.6.0.orig/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ qtbase-opensource-src-5.6.0/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -251,10 +251,7 @@ void TableGenerator::initPossibleLocatio @@ -251,10 +251,7 @@ void TableGenerator::initPossibleLocatio
// the QTCOMPOSE environment variable // the QTCOMPOSE environment variable
if (qEnvironmentVariableIsSet("QTCOMPOSE")) if (qEnvironmentVariableIsSet("QTCOMPOSE"))

6
pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp Index: qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp --- qtbase-opensource-src-5.5.1.orig/src/network/ssl/qsslsocket_openssl.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp +++ qtbase-opensource-src-5.5.1/src/network/ssl/qsslsocket_openssl.cpp
@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
****************************************************************************/ ****************************************************************************/

48
pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
View File

@ -24,7 +24,6 @@
}: }:
let let
inherit (srcs.qt5) version;
system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
# Search path for Gtk plugin # Search path for Gtk plugin
@ -33,19 +32,11 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "qtbase-${version}"; name = "qtbase-${srcs.qtbase.version}";
inherit version; inherit (srcs.qtbase) src version;
srcs = with srcs; [ qt5.src qtbase.src ];
sourceRoot = "qt-everywhere-opensource-src-${version}";
outputs = [ "dev" "out" "gtk" ]; outputs = [ "dev" "out" "gtk" ];
postUnpack = ''
mv qtbase-opensource-src-${version} $sourceRoot/qtbase
'';
patches = patches =
copyPathsToStore (lib.readPathsFromFile ./. ./series) copyPathsToStore (lib.readPathsFromFile ./. ./series)
++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
@ -54,38 +45,37 @@ stdenv.mkDerivation {
postPatch = postPatch =
'' ''
substituteInPlace configure --replace /bin/pwd pwd substituteInPlace configure --replace /bin/pwd pwd
substituteInPlace qtbase/configure --replace /bin/pwd pwd substituteInPlace src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i mkspecs/*/*.conf
sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5Config.cmake.in"
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "src/corelib/Qt5CoreMacros.cmake"
sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in" sed -i 's/NO_DEFAULT_PATH//' "src/gui/Qt5GuiConfigExtras.cmake.in"
sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in" sed -i 's/PATHS.*NO_DEFAULT_PATH//' "mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \ substituteInPlace src/network/kernel/qdnslookup_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}" --replace "@glibc@" "${stdenv.cc.libc.out}"
substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \ substituteInPlace src/network/kernel/qhostinfo_unix.cpp \
--replace "@glibc@" "${stdenv.cc.libc.out}" --replace "@glibc@" "${stdenv.cc.libc.out}"
substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \ substituteInPlace src/plugins/platforms/xcb/qxcbcursor.cpp \
--replace "@libXcursor@" "${libXcursor.out}" --replace "@libXcursor@" "${libXcursor.out}"
substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \ substituteInPlace src/network/ssl/qsslsocket_openssl_symbols.cpp \
--replace "@openssl@" "${openssl.out}" --replace "@openssl@" "${openssl.out}"
substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \ substituteInPlace src/dbus/qdbus_symbols.cpp \
--replace "@dbus_libs@" "${dbus.lib}" --replace "@dbus_libs@" "${dbus.lib}"
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
--replace "@libX11@" "${libX11.out}" --replace "@libX11@" "${libX11.out}"
'' ''
+ lib.optionalString mesaSupported '' + lib.optionalString mesaSupported ''
substituteInPlace \ substituteInPlace \
qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \ src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
--replace "@mesa_lib@" "${mesa.out}" --replace "@mesa_lib@" "${mesa.out}"
substituteInPlace qtbase/mkspecs/common/linux.conf \ substituteInPlace mkspecs/common/linux.conf \
--replace "@mesa_lib@" "${mesa.out}" \ --replace "@mesa_lib@" "${mesa.out}" \
--replace "@mesa_inc@" "${mesa.dev or mesa}" --replace "@mesa_inc@" "${mesa.dev or mesa}"
''; '';
@ -93,7 +83,7 @@ stdenv.mkDerivation {
setOutputFlags = false; setOutputFlags = false;
preConfigure = '' preConfigure = ''
export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH" export LD_LIBRARY_PATH="$PWD/lib:$PWD/plugins/platforms:$LD_LIBRARY_PATH"
export MAKEFLAGS=-j$NIX_BUILD_CORES export MAKEFLAGS=-j$NIX_BUILD_CORES
configureFlags+="\ configureFlags+="\
@ -101,10 +91,6 @@ stdenv.mkDerivation {
-importdir $out/lib/qt5/imports \ -importdir $out/lib/qt5/imports \
-qmldir $out/lib/qt5/qml \ -qmldir $out/lib/qt5/qml \
-docdir $out/share/doc/qt5" -docdir $out/share/doc/qt5"
''
# QMake expects to extract the list of available modules from .gitmodules
+ ''
echo '[submodule "qtbase"]' >.gitmodules
''; '';
prefixKey = "-prefix "; prefixKey = "-prefix ";

6
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp Index: qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp --- qtbase-opensource-src-5.5.1.orig/src/dbus/qdbus_symbols.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp +++ qtbase-opensource-src-5.5.1/src/dbus/qdbus_symbols.cpp
@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus() @@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QLatin1String("dbus-1"), QLatin1String("dbus-1"),

6
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp Index: qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp --- qtbase-opensource-src-5.5.1.orig/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ qtbase-opensource-src-5.5.1/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const @@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
{ {
extern const QString qt_gl_library_name(); extern const QString qt_gl_library_name();

12
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtk2painter.cpp --- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtk2painter.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp +++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtk2painter.cpp
@@ -96,7 +96,7 @@ static void initGtk() @@ -96,7 +96,7 @@ static void initGtk()
static bool initialized = false; static bool initialized = false;
if (!initialized) { if (!initialized) {
@ -11,10 +11,10 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter
QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp Index: qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp --- qtbase-opensource-src-5.5.1.orig/src/widgets/styles/qgtkstyle_p.cpp
+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp +++ qtbase-opensource-src-5.5.1/src/widgets/styles/qgtkstyle_p.cpp
@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus @@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
void QGtkStylePrivate::resolveGtk() const void QGtkStylePrivate::resolveGtk() const
{ {

6
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp Index: qtbase-opensource-src-5.6.0/src/plugins/platforms/xcb/qxcbcursor.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp --- qtbase-opensource-src-5.6.0.orig/src/plugins/platforms/xcb/qxcbcursor.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +++ qtbase-opensource-src-5.6.0/src/plugins/platforms/xcb/qxcbcursor.cpp
@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c @@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
#if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY) #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
static bool function_ptrs_not_initialized = true; static bool function_ptrs_not_initialized = true;

6
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp Index: qtbase-opensource-src-5.6.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp --- qtbase-opensource-src-5.6.0.orig/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +++ qtbase-opensource-src-5.6.0/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -652,8 +652,8 @@ static QPair<QLibrary*, QLibrary*> loadO @@ -652,8 +652,8 @@ static QPair<QLibrary*, QLibrary*> loadO
#endif #endif
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so

12
pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp Index: qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp --- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qdnslookup_unix.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp +++ qtbase-opensource-src-5.6.0/src/network/kernel/qdnslookup_unix.cpp
@@ -79,7 +79,7 @@ static void resolveLibrary() @@ -79,7 +79,7 @@ static void resolveLibrary()
if (!lib.load()) if (!lib.load())
#endif #endif
@ -11,10 +11,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_u
if (!lib.load()) if (!lib.load())
return; return;
} }
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp Index: qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp --- qtbase-opensource-src-5.6.0.orig/src/network/kernel/qhostinfo_unix.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp +++ qtbase-opensource-src-5.6.0/src/network/kernel/qhostinfo_unix.cpp
@@ -95,7 +95,7 @@ static void resolveLibrary() @@ -95,7 +95,7 @@ static void resolveLibrary()
if (!lib.load()) if (!lib.load())
#endif #endif

6
pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
View File

@ -9,10 +9,10 @@ is defined in openssl, but not in libressl.
src/network/ssl/qsslcontext_openssl.cpp | 4 ++-- src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp Index: qtbase-opensource-src-5.6.0/src/network/ssl/qsslcontext_openssl.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp --- qtbase-opensource-src-5.6.0.orig/src/network/ssl/qsslcontext_openssl.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp +++ qtbase-opensource-src-5.6.0/src/network/ssl/qsslcontext_openssl.cpp
@@ -340,7 +340,7 @@ init_context: @@ -340,7 +340,7 @@ init_context:
const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves(); const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();

6
pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf Index: qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf --- qtbase-opensource-src-5.5.1.orig/mkspecs/common/linux.conf
+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf +++ qtbase-opensource-src-5.5.1/mkspecs/common/linux.conf
@@ -12,8 +12,8 @@ QMAKE_INCDIR = @@ -12,8 +12,8 @@ QMAKE_INCDIR =
QMAKE_LIBDIR = QMAKE_LIBDIR =
QMAKE_INCDIR_X11 = QMAKE_INCDIR_X11 =

6
pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp Index: qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp --- qtbase-opensource-src-5.6.0.orig/src/corelib/kernel/qcoreapplication.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp +++ qtbase-opensource-src-5.6.0/src/corelib/kernel/qcoreapplication.cpp
@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat @@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat
QStringList *app_libpaths = new QStringList; QStringList *app_libpaths = new QStringList;
coreappdata()->app_libpaths.reset(app_libpaths); coreappdata()->app_libpaths.reset(app_libpaths);

6
pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp --- qtbase-opensource-src-5.6.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +++ qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q @@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
// Parse zone.tab table, assume lists all installed zones, if not will need to read directories // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
static QTzTimeZoneHash loadTzTimeZones() static QTzTimeZoneHash loadTzTimeZones()

12
pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
View File

@ -1,7 +1,7 @@
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp Index: qtbase-opensource-src-5.6.0/src/corelib/io/qsettings.cpp
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings.cpp --- qtbase-opensource-src-5.6.0.orig/src/corelib/io/qsettings.cpp
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp +++ qtbase-opensource-src-5.6.0/src/corelib/io/qsettings.cpp
@@ -1155,6 +1155,24 @@ QConfFileSettingsPrivate::QConfFileSetti @@ -1155,6 +1155,24 @@ QConfFileSettingsPrivate::QConfFileSetti
if (!application.isEmpty()) if (!application.isEmpty())
confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
@ -27,10 +27,10 @@ Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
#else #else
QString confName = getPath(format, QSettings::UserScope) + org; QString confName = getPath(format, QSettings::UserScope) + org;
if (!application.isEmpty()) if (!application.isEmpty())
Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h Index: qtbase-opensource-src-5.6.0/src/corelib/io/qsettings_p.h
=================================================================== ===================================================================
--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings_p.h --- qtbase-opensource-src-5.6.0.orig/src/corelib/io/qsettings_p.h
+++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h +++ qtbase-opensource-src-5.6.0/src/corelib/io/qsettings_p.h
@@ -241,7 +241,7 @@ public: @@ -241,7 +241,7 @@ public:
F_Organization = 0x1, F_Organization = 0x1,
F_User = 0x0, F_User = 0x0,

470
pkgs/development/libraries/qt-5/5.6/srcs.nix
View File

@ -1,261 +1,261 @@
# DO NOT EDIT! This file is generated automatically by manifest.sh # DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
{ fetchurl, mirror }: { fetchurl, mirror }:
{ {
qttools = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz";
sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d";
name = "qttools-opensource-src-5.6.0.tar.xz";
};
};
qtwebengine = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz";
sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la";
name = "qtwebengine-opensource-src-5.6.0.tar.xz";
};
};
qtserialbus = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz";
sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc";
name = "qtserialbus-opensource-src-5.6.0.tar.xz";
};
};
qtwayland = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz";
sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm";
name = "qtwayland-opensource-src-5.6.0.tar.xz";
};
};
qt5 = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz";
sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k";
name = "qt5-opensource-src-5.6.0.tar.xz";
};
};
qtimageformats = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz";
sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c";
name = "qtimageformats-opensource-src-5.6.0.tar.xz";
};
};
qtactiveqt = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz";
sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a";
name = "qtactiveqt-opensource-src-5.6.0.tar.xz";
};
};
qtdoc = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz";
sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap";
name = "qtdoc-opensource-src-5.6.0.tar.xz";
};
};
qtsensors = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz";
sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si";
name = "qtsensors-opensource-src-5.6.0.tar.xz";
};
};
qtwebchannel = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz";
sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62";
name = "qtwebchannel-opensource-src-5.6.0.tar.xz";
};
};
qtmacextras = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz";
sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj";
name = "qtmacextras-opensource-src-5.6.0.tar.xz";
};
};
qtwebsockets = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz";
sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6";
name = "qtwebsockets-opensource-src-5.6.0.tar.xz";
};
};
qtconnectivity = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz";
sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c";
name = "qtconnectivity-opensource-src-5.6.0.tar.xz";
};
};
qtscript = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz";
sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c";
name = "qtscript-opensource-src-5.6.0.tar.xz";
};
};
qttranslations = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz";
sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq";
name = "qttranslations-opensource-src-5.6.0.tar.xz";
};
};
qtlocation = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz";
sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in";
name = "qtlocation-opensource-src-5.6.0.tar.xz";
};
};
qtserialport = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz";
sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn";
name = "qtserialport-opensource-src-5.6.0.tar.xz";
};
};
qtsvg = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz";
sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr";
name = "qtsvg-opensource-src-5.6.0.tar.xz";
};
};
qtwebview = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz";
sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4";
name = "qtwebview-opensource-src-5.6.0.tar.xz";
};
};
qtcanvas3d = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz";
sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6";
name = "qtcanvas3d-opensource-src-5.6.0.tar.xz";
};
};
qtwinextras = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz";
sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq";
name = "qtwinextras-opensource-src-5.6.0.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81";
name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
};
};
qtxmlpatterns = { qtxmlpatterns = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtxmlpatterns-opensource-src-5.6.1.tar.xz";
sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds"; sha256 = "0q412jv3xbg7v05b8pbahifwx17gzlp96s90akh6zwhpm8i6xx34";
name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz"; name = "qtxmlpatterns-opensource-src-5.6.1.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz";
sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r";
name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz";
};
};
qtbase = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz";
sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf";
name = "qtbase-opensource-src-5.6.0.tar.xz";
};
};
qt3d = {
version = "5.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz";
sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr";
name = "qt3d-opensource-src-5.6.0.tar.xz";
};
};
qtenginio = {
version = "1.6.0";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz";
sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2";
name = "qtenginio-opensource-src-1.6.0.tar.xz";
}; };
}; };
qtx11extras = { qtx11extras = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtx11extras-opensource-src-5.6.1.tar.xz";
sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7"; sha256 = "0l736qiz8adrnh267xz63hv4sph6nhy90h836qfnnmv3p78ipsz8";
name = "qtx11extras-opensource-src-5.6.0.tar.xz"; name = "qtx11extras-opensource-src-5.6.1.tar.xz";
}; };
}; };
qtdeclarative = { qtwinextras = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwinextras-opensource-src-5.6.1.tar.xz";
sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc"; sha256 = "1db3lcrj8af0z8lnh99lfbwz1cq9il7rr27rk9l38dff65qkssm8";
name = "qtdeclarative-opensource-src-5.6.0.tar.xz"; name = "qtwinextras-opensource-src-5.6.1.tar.xz";
}; };
}; };
qtmultimedia = { qtwebview = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebview-opensource-src-5.6.1.tar.xz";
sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh"; sha256 = "0q869wl61vidds551w3z49ysx88xqyn6igbz07zxac7d0gwgwpda";
name = "qtmultimedia-opensource-src-5.6.0.tar.xz"; name = "qtwebview-opensource-src-5.6.1.tar.xz";
};
};
qtwebsockets = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebsockets-opensource-src-5.6.1.tar.xz";
sha256 = "0fkj52i4yi6gmq4jfjgdij08cspxspac6mbpf0fknnllimmkl7jm";
name = "qtwebsockets-opensource-src-5.6.1.tar.xz";
};
};
qtwebengine = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebengine-opensource-src-5.6.1.tar.xz";
sha256 = "0yv0cflgywsyfn84vv2vc9rwpm8j7hin61rxqjqh498nnl2arw5x";
name = "qtwebengine-opensource-src-5.6.1.tar.xz";
};
};
qtwebchannel = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwebchannel-opensource-src-5.6.1.tar.xz";
sha256 = "01q80917a1048hdhaii4v50dqs84h16lc9w3v99r9xvspk8vab7q";
name = "qtwebchannel-opensource-src-5.6.1.tar.xz";
};
};
qtwayland = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtwayland-opensource-src-5.6.1.tar.xz";
sha256 = "1jgghjfrg0wwyfzfwgwhagwxz9k936ylv3w2l9bwlpql8rgm8d11";
name = "qtwayland-opensource-src-5.6.1.tar.xz";
};
};
qttranslations = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttranslations-opensource-src-5.6.1.tar.xz";
sha256 = "008wyk00mqz116pigm0qq78rvg28v6ykjnjxppkjnk0yd6i2vmb9";
name = "qttranslations-opensource-src-5.6.1.tar.xz";
};
};
qttools = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qttools-opensource-src-5.6.1.tar.xz";
sha256 = "0wbzq60d7lkvlb7b5lqcw87qgy6kyjz1npjavz8f4grdxsaqi8vp";
name = "qttools-opensource-src-5.6.1.tar.xz";
};
};
qtsvg = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsvg-opensource-src-5.6.1.tar.xz";
sha256 = "08ca5g46g75acy27jfnvnalmcias5hxmjp7491v3y4k9y7a4ybpi";
name = "qtsvg-opensource-src-5.6.1.tar.xz";
};
};
qtserialport = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialport-opensource-src-5.6.1.tar.xz";
sha256 = "1hp63cgqhps6y1k041lzhcb2b0rcpcmszabnn293q5ilbvla4x0b";
name = "qtserialport-opensource-src-5.6.1.tar.xz";
};
};
qtserialbus = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtserialbus-opensource-src-5.6.1.tar.xz";
sha256 = "1h683dkvnf2rdgxgisybnp8miqgn2gpi597rgx5zc7qk2k8kyidz";
name = "qtserialbus-opensource-src-5.6.1.tar.xz";
};
};
qtsensors = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtsensors-opensource-src-5.6.1.tar.xz";
sha256 = "0bll7ll6s5g8w89knyrc0famjwqyfzwpn512m1f96bf6xwacs967";
name = "qtsensors-opensource-src-5.6.1.tar.xz";
};
};
qtscript = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtscript-opensource-src-5.6.1.tar.xz";
sha256 = "17zp5dlfplrnzlw233lzapj55drjqchvayajd02qsggzms3yzchw";
name = "qtscript-opensource-src-5.6.1.tar.xz";
};
};
qtquickcontrols2 = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols2-opensource-src-5.6.1.tar.xz";
sha256 = "13zbiv63b76ifpjalx5616nixfwjk48q977bzb1xxj363b7xv85v";
name = "qtquickcontrols2-opensource-src-5.6.1.tar.xz";
}; };
}; };
qtquickcontrols = { qtquickcontrols = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtquickcontrols-opensource-src-5.6.1.tar.xz";
sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c"; sha256 = "14d68ryn7r7rs7klpldnavcsccvyyg0xhwqkvjlm5wwplv2acah1";
name = "qtquickcontrols-opensource-src-5.6.0.tar.xz"; name = "qtquickcontrols-opensource-src-5.6.1.tar.xz";
};
};
qtmultimedia = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmultimedia-opensource-src-5.6.1.tar.xz";
sha256 = "058523c2qra3d8fq46ygcndnkrbwlh316zy28s2cr5pjr5gmnjyj";
name = "qtmultimedia-opensource-src-5.6.1.tar.xz";
};
};
qtmacextras = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtmacextras-opensource-src-5.6.1.tar.xz";
sha256 = "147yhv7fb0yaakrffqiw6xz8ycqdc7qsnxvnpr6j8rarw5xmdc73";
name = "qtmacextras-opensource-src-5.6.1.tar.xz";
};
};
qtlocation = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtlocation-opensource-src-5.6.1.tar.xz";
sha256 = "0qahs7a2n3l4h0bl8bnwci9mzy1vra3zncnzr40csic9ys67ddfk";
name = "qtlocation-opensource-src-5.6.1.tar.xz";
};
};
qtimageformats = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtimageformats-opensource-src-5.6.1.tar.xz";
sha256 = "020v1148433zx4g87z2r8fgff32n0laajxqqsja1l3yzz7jbrwvl";
name = "qtimageformats-opensource-src-5.6.1.tar.xz";
};
};
qtgraphicaleffects = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
sha256 = "1n0i2drfr7fvydgg810dcij8mxnygdpvqcqv7l1a9a1kv9ap3sap";
name = "qtgraphicaleffects-opensource-src-5.6.1.tar.xz";
};
};
qtenginio = {
version = "1.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtenginio-opensource-src-1.6.1.tar.xz";
sha256 = "1iq4lnz3s6mfdgml61b9lsjisky55bbvsdj72kh003j94mzrc3l5";
name = "qtenginio-opensource-src-1.6.1.tar.xz";
};
};
qtdoc = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdoc-opensource-src-5.6.1.tar.xz";
sha256 = "0yg7903vk4w3h6jjyanssfcig0s2s660q11sj14nw6gcjs7kfa5z";
name = "qtdoc-opensource-src-5.6.1.tar.xz";
};
};
qtdeclarative-render2d = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
sha256 = "1m08x8x355545r9wgrjl5p26zjhp5q1yh3h25dww8pk25v6cn8dg";
name = "qtdeclarative-render2d-opensource-src-5.6.1.tar.xz";
};
};
qtdeclarative = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtdeclarative-opensource-src-5.6.1.tar.xz";
sha256 = "1d2217kxk85kpi7ls08b41hqzy26hvch8m4cgzq6km5sqi5zvz0j";
name = "qtdeclarative-opensource-src-5.6.1.tar.xz";
};
};
qtconnectivity = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtconnectivity-opensource-src-5.6.1.tar.xz";
sha256 = "06fr9321f52kf0nda9zjjfzp5694hbnx0y0v315iw28mnpvandas";
name = "qtconnectivity-opensource-src-5.6.1.tar.xz";
};
};
qtcanvas3d = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtcanvas3d-opensource-src-5.6.1.tar.xz";
sha256 = "0q17hwmj893pk0lhxmibxmgk6h1gy4ksqfi62rkfzcf81bg2q7hr";
name = "qtcanvas3d-opensource-src-5.6.1.tar.xz";
};
};
qtbase = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtbase-opensource-src-5.6.1.tar.xz";
sha256 = "0r3jrqymnnxrig4f11xvs33c26f0kzfakbp3kcbdpv795gpc276h";
name = "qtbase-opensource-src-5.6.1.tar.xz";
}; };
}; };
qtandroidextras = { qtandroidextras = {
version = "5.6.0"; version = "5.6.1";
src = fetchurl { src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz"; url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtandroidextras-opensource-src-5.6.1.tar.xz";
sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0"; sha256 = "0prkpb57j0s8k36sba47k2bhs3ajf01rdwc7qf5gkvhs991rwckc";
name = "qtandroidextras-opensource-src-5.6.0.tar.xz"; name = "qtandroidextras-opensource-src-5.6.1.tar.xz";
};
};
qtactiveqt = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qtactiveqt-opensource-src-5.6.1.tar.xz";
sha256 = "0a2p0w03d04hqg71hlihj9mr6aasvb0h8jfa5rnq8b5rkm8haf4f";
name = "qtactiveqt-opensource-src-5.6.1.tar.xz";
};
};
qt3d = {
version = "5.6.1";
src = fetchurl {
url = "${mirror}/official_releases/qt/5.6/5.6.1/submodules/qt3d-opensource-src-5.6.1.tar.xz";
sha256 = "03d81sls30a20yna6940np15112ciwy5024f8n5imaxicm8h34xd";
name = "qt3d-opensource-src-5.6.1.tar.xz";
}; };
}; };
} }