From 0d1a1a49547215ccc36197a53e49d14edf193faa Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 23 Jun 2017 09:55:04 -0500 Subject: [PATCH 1/3] plasma-workspace: no propagatedBuildInputs Only libraries may have propagatedBuildInputs. --- pkgs/desktops/plasma-5/plasma-workspace/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index b866ebab0e5..b28a1e87fb6 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -20,8 +20,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ isocodes libdbusmenu libSM libXcursor libXtst pam wayland - ]; - propagatedBuildInputs = [ + baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets From 22b10bac78eb2b27e45248015d30e5e658174ca6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 17 Jun 2017 11:26:19 -0500 Subject: [PATCH 2/3] qt5: 5.8.0 -> 5.9.0 Qt 5.8 is immediately removed because its support window is ended. The qtlocation module is built with `enableParallelBuilding = false` so that the clipper library will be built before the components which link to it. kjs now depends directly on pcre. The dependency was previously propagated from qtbase, which now depends on pcre2. --- .../libraries/kde-frameworks/kjs.nix | 4 +- pkgs/development/libraries/qt-5/5.8/fetch.sh | 3 - .../qt-5/5.8/qtbase/xdg-config-dirs.patch | 41 --- .../qt-5/5.8/qtwebengine/default.nix | 97 ----- pkgs/development/libraries/qt-5/5.8/srcs.nix | 325 ----------------- .../libraries/qt-5/{5.8 => 5.9}/default.nix | 0 pkgs/development/libraries/qt-5/5.9/fetch.sh | 3 + .../{5.8 => 5.9}/qtbase/cmake-paths.patch | 64 ++-- .../qtbase/compose-search-path.patch | 8 +- .../qt-5/{5.8 => 5.9}/qtbase/default.nix | 4 +- .../qt-5/{5.8 => 5.9}/qtbase/dlopen-gl.patch | 10 +- .../{5.8 => 5.9}/qtbase/dlopen-gtkstyle.patch | 0 .../qtbase/dlopen-libXcursor.patch | 13 +- .../{5.8 => 5.9}/qtbase/dlopen-resolv.patch | 16 +- .../{5.8 => 5.9}/qtbase/library-paths.patch | 8 +- .../qt-5/{5.8 => 5.9}/qtbase/libressl.patch | 0 .../qt-5/{5.8 => 5.9}/qtbase/qgtk-env.patch | 0 .../qtbase/qnativesocketengine-type-pun.patch | 0 .../libraries/qt-5/{5.8 => 5.9}/qtbase/series | 1 - .../qt-5/{5.8 => 5.9}/qtbase/tzdir.patch | 8 +- .../qt-5/{5.8 => 5.9}/qtconnectivity.nix | 0 .../{5.8 => 5.9}/qtdeclarative/default.nix | 0 .../qtdeclarative/import-paths.patch | 0 .../qt-5/{5.8 => 5.9}/qtdeclarative/series | 0 .../libraries/qt-5/{5.8 => 5.9}/qtdoc.nix | 0 .../qt-5/{5.8 => 5.9}/qtgraphicaleffects.nix | 0 .../qt-5/{5.8 => 5.9}/qtimageformats.nix | 0 .../qt-5/{5.8 => 5.9}/qtlocation.nix | 2 + .../qt-5/{5.8 => 5.9}/qtmacextras.nix | 0 .../qt-5/{5.8 => 5.9}/qtmultimedia.nix | 0 .../qt-5/{5.8 => 5.9}/qtquickcontrols.nix | 0 .../qt-5/{5.8 => 5.9}/qtquickcontrols2.nix | 0 .../qtscript/0001-glib-2.32.patch | 0 .../qt-5/{5.8 => 5.9}/qtscript/default.nix | 0 .../libraries/qt-5/{5.8 => 5.9}/qtsensors.nix | 0 .../{5.8 => 5.9}/qtserialport/default.nix | 0 .../qtserialport-dlopen-udev.patch | 0 .../qt-5/{5.8 => 5.9}/qtserialport/series | 0 .../libraries/qt-5/{5.8 => 5.9}/qtsvg.nix | 0 .../{5.8 => 5.9}/qttools/cmake-paths.patch | 0 .../qt-5/{5.8 => 5.9}/qttools/default.nix | 0 .../qt-5/{5.8 => 5.9}/qttools/series | 0 .../qt-5/{5.8 => 5.9}/qttranslations.nix | 0 .../libraries/qt-5/{5.8 => 5.9}/qtwayland.nix | 2 +- .../qt-5/{5.8 => 5.9}/qtwebchannel.nix | 0 .../qt-5/5.9/qtwebengine/default.nix | 113 ++++++ .../qtwebengine-paxmark-mksnapshot.patch | 24 +- .../qt-5/{5.8 => 5.9}/qtwebkit/default.nix | 0 .../qtwebkit/qtwebkit-dlopen-gtk.patch | 0 .../qtwebkit/qtwebkit-dlopen-udev.patch | 0 .../qtwebkit/qtwebkit-icucore-darwin.patch | 0 .../qt-5/{5.8 => 5.9}/qtwebkit/series | 0 .../qt-5/{5.8 => 5.9}/qtwebsockets.nix | 0 .../qt-5/{5.8 => 5.9}/qtx11extras.nix | 0 .../qt-5/{5.8 => 5.9}/qtxmlpatterns.nix | 0 pkgs/development/libraries/qt-5/5.9/srcs.nix | 333 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 +- 57 files changed, 536 insertions(+), 553 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.8/fetch.sh delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix delete mode 100644 pkgs/development/libraries/qt-5/5.8/srcs.nix rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/default.nix (100%) create mode 100644 pkgs/development/libraries/qt-5/5.9/fetch.sh rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/cmake-paths.patch (89%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/compose-search-path.patch (78%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/default.nix (98%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-gl.patch (73%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-gtkstyle.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-libXcursor.patch (57%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/dlopen-resolv.patch (55%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/library-paths.patch (76%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/libressl.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/qgtk-env.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/qnativesocketengine-type-pun.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/series (88%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtbase/tzdir.patch (88%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtconnectivity.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/default.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/import-paths.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdeclarative/series (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtdoc.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtgraphicaleffects.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtimageformats.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtlocation.nix (73%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtmacextras.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtmultimedia.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtquickcontrols.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtquickcontrols2.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtscript/0001-glib-2.32.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtscript/default.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtsensors.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/default.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/qtserialport-dlopen-udev.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtserialport/series (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtsvg.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/cmake-paths.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/default.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttools/series (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qttranslations.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwayland.nix (88%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebchannel.nix (100%) create mode 100644 pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebengine/qtwebengine-paxmark-mksnapshot.patch (59%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/default.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-dlopen-gtk.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-dlopen-udev.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/qtwebkit-icucore-darwin.patch (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebkit/series (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtwebsockets.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtx11extras.nix (100%) rename pkgs/development/libraries/qt-5/{5.8 => 5.9}/qtxmlpatterns.nix (100%) create mode 100644 pkgs/development/libraries/qt-5/5.9/srcs.nix diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index 62bcc0065b3..311f07241d6 100644 --- a/pkgs/development/libraries/kde-frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, extra-cmake-modules, kdoctools, - qtbase, + pcre, qtbase, }: mkDerivation { name = "kjs"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ qtbase ]; + buildInputs = [ pcre qtbase ]; } diff --git a/pkgs/development/libraries/qt-5/5.8/fetch.sh b/pkgs/development/libraries/qt-5/5.8/fetch.sh deleted file mode 100644 index 2e21cdefba6..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/fetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/ \ - http://download.qt.io/community_releases/5.8/5.8.0-final/ \ - -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch deleted file mode 100644 index b5c21f064a4..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/xdg-config-dirs.patch +++ /dev/null @@ -1,41 +0,0 @@ -Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp -=================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings.cpp -+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings.cpp -@@ -1134,6 +1134,23 @@ QConfFileSettingsPrivate::QConfFileSetti - confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false)); - confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false)); - -+#if !defined(Q_OS_WIN) -+ // Add directories specified in $XDG_CONFIG_DIRS -+ const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS")); -+ if (!pathEnv.isEmpty()) { -+ const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); -+ if (!pathEntries.isEmpty()) { -+ int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those. -+ for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) { -+ const QString& path = pathEntries.at(k); -+ if (!application.isEmpty()) -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false)); -+ confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false)); -+ } -+ } -+ } -+#endif -+ - for (i = 0; i < NumConfFiles; ++i) { - if (confFiles[i]) { - spec = i; -Index: qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h -=================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/io/qsettings_p.h -+++ qtbase-opensource-src-5.8.0/src/corelib/io/qsettings_p.h -@@ -246,7 +246,7 @@ public: - F_Organization = 0x1, - F_User = 0x0, - F_System = 0x2, -- NumConfFiles = 4 -+ NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis - }; - - QSettings::Format format; diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix deleted file mode 100644 index 871fb21c106..00000000000 --- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel - -, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst -, fontconfig, freetype, harfbuzz, icu, dbus -, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus -, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent -, alsaLib -, libcap -, pciutils -, systemd - -, bison, flex, git, which, gperf -, coreutils -, pkgconfig, python2 -, enableProprietaryCodecs ? true - -, lib, stdenv # lib.optional, needsPax -}: - -with stdenv.lib; - -qtSubmodule { - name = "qtwebengine"; - qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; - buildInputs = [ bison flex git which gperf ]; - nativeBuildInputs = [ pkgconfig python2 coreutils ]; - doCheck = true; - outputs = [ "out" "dev" "bin" ]; - - enableParallelBuilding = true; - - preConfigure = '' - export MAKEFLAGS=-j$NIX_BUILD_CORES - substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ - --replace /bin/echo ${coreutils}/bin/echo - - # Fix library paths - sed -i \ - -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ - -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ - src/core/web_engine_library_info.cpp - '' + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ - src/3rdparty/chromium/device/udev_linux/udev?_loader.cc - - sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ - src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc - ''; - - qmakeFlags = optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; - - propagatedBuildInputs = [ - # Image formats - libjpeg libpng libtiff libwebp - - # Video formats - srtp libvpx - - # Audio formats - libopus - - # Text rendering - harfbuzz icu - ] - ++ optionals (!stdenv.isDarwin) [ - dbus zlib minizip snappy nss protobuf jsoncpp libevent - - # Audio formats - alsaLib - - # Text rendering - fontconfig freetype - - libcap - pciutils - - # X11 libs - xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst - xlibs.libXcomposite - ]; - patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; - postInstall = '' - cat > $out/libexec/qt.conf <app_libpaths.reset(app_libpaths); diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/libressl.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/libressl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qgtk-env.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtbase/qnativesocketengine-type-pun.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/qnativesocketengine-type-pun.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.9/qtbase/series similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/series rename to pkgs/development/libraries/qt-5/5.9/qtbase/series index f3387694518..4f354e87c84 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/series +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/series @@ -1,7 +1,6 @@ dlopen-resolv.patch tzdir.patch dlopen-libXcursor.patch -xdg-config-dirs.patch library-paths.patch libressl.patch dlopen-gl.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch rename to pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch index b8c05815a78..d57f24c3ed0 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtbase/tzdir.patch +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/tzdir.patch @@ -1,7 +1,7 @@ -Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +Index: qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp =================================================================== ---- qtbase-opensource-src-5.8.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp -+++ qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp +--- qtbase-opensource-src-5.9.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ qtbase-opensource-src-5.9.0/src/corelib/tools/qtimezoneprivate_tz.cpp @@ -70,7 +70,11 @@ typedef QHash Q // Parse zone.tab table, assume lists all installed zones, if not will need to read directories static QTzTimeZoneHash loadTzTimeZones() @@ -15,7 +15,7 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/tools/qtimezoneprivate_tz.cpp if (!QFile::exists(path)) path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); -@@ -642,12 +646,16 @@ void QTzTimeZonePrivate::init(const QByt +@@ -643,12 +647,16 @@ void QTzTimeZonePrivate::init(const QByt if (!tzif.open(QIODevice::ReadOnly)) return; } else { diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix rename to pkgs/development/libraries/qt-5/5.9/qtconnectivity.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/import-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.9/qtdeclarative/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/series rename to pkgs/development/libraries/qt-5/5.9/qtdeclarative/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.9/qtdoc.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtdoc.nix rename to pkgs/development/libraries/qt-5/5.9/qtdoc.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtgraphicaleffects.nix rename to pkgs/development/libraries/qt-5/5.9/qtgraphicaleffects.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.9/qtimageformats.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtimageformats.nix rename to pkgs/development/libraries/qt-5/5.9/qtimageformats.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix similarity index 73% rename from pkgs/development/libraries/qt-5/5.8/qtlocation.nix rename to pkgs/development/libraries/qt-5/5.9/qtlocation.nix index 0eabe04e478..24f0b648723 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtlocation.nix @@ -8,4 +8,6 @@ qtSubmodule { moveToOutput "$qtPluginPrefix" "$bin" moveToOutput "$qtQmlPrefix" "$bin" ''; + # Linking with -lclipper fails with parallel build enabled + enableParallelBuild = false; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtmacextras.nix b/pkgs/development/libraries/qt-5/5.9/qtmacextras.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmacextras.nix rename to pkgs/development/libraries/qt-5/5.9/qtmacextras.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix rename to pkgs/development/libraries/qt-5/5.9/qtmultimedia.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix rename to pkgs/development/libraries/qt-5/5.9/qtquickcontrols2.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/0001-glib-2.32.patch rename to pkgs/development/libraries/qt-5/5.9/qtscript/0001-glib-2.32.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.9/qtscript/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtscript/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtscript/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.9/qtsensors.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsensors.nix rename to pkgs/development/libraries/qt-5/5.9/qtsensors.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix rename to pkgs/development/libraries/qt-5/5.9/qtserialport/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch rename to pkgs/development/libraries/qt-5/5.9/qtserialport/qtserialport-dlopen-udev.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.9/qtserialport/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtserialport/series rename to pkgs/development/libraries/qt-5/5.9/qtserialport/series diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.9/qtsvg.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtsvg.nix rename to pkgs/development/libraries/qt-5/5.9/qtsvg.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/cmake-paths.patch rename to pkgs/development/libraries/qt-5/5.9/qttools/cmake-paths.patch diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.9/qttools/default.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/default.nix rename to pkgs/development/libraries/qt-5/5.9/qttools/default.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/series b/pkgs/development/libraries/qt-5/5.9/qttools/series similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttools/series rename to pkgs/development/libraries/qt-5/5.9/qttools/series diff --git a/pkgs/development/libraries/qt-5/5.8/qttranslations.nix b/pkgs/development/libraries/qt-5/5.9/qttranslations.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qttranslations.nix rename to pkgs/development/libraries/qt-5/5.9/qttranslations.nix diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix similarity index 88% rename from pkgs/development/libraries/qt-5/5.8/qtwayland.nix rename to pkgs/development/libraries/qt-5/5.9/qtwayland.nix index 7b7bd2f6ebc..3e5deea7ec1 100644 --- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtwayland.nix @@ -8,6 +8,6 @@ qtSubmodule { outputs = [ "out" "dev" "bin" ]; postInstall = '' moveToOutput "$qtPluginPrefix" "$bin" - moveToOutput "$qtQmlPrefix "$bin" + moveToOutput "$qtQmlPrefix" "$bin" ''; } diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix similarity index 100% rename from pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix rename to pkgs/development/libraries/qt-5/5.9/qtwebchannel.nix diff --git a/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix new file mode 100644 index 00000000000..1684e6aac70 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.9/qtwebengine/default.nix @@ -0,0 +1,113 @@ +{ qtSubmodule, qtquickcontrols, qtlocation, qtwebchannel + +, bison, coreutils, flex, git, gperf, ninja, pkgconfig, python2, which + +, xlibs, libXcursor, libXScrnSaver, libXrandr, libXtst +, fontconfig, freetype, harfbuzz, icu, dbus +, zlib, minizip, libjpeg, libpng, libtiff, libwebp, libopus +, jsoncpp, protobuf, libvpx, srtp, snappy, nss, libevent +, alsaLib +, libcap +, pciutils +, systemd + +, enableProprietaryCodecs ? true + +, lib, stdenv # lib.optional, needsPax +}: + +with stdenv.lib; + +qtSubmodule { + name = "qtwebengine"; + qtInputs = [ qtquickcontrols qtlocation qtwebchannel ]; + nativeBuildInputs = [ + bison coreutils flex git gperf ninja pkgconfig python2 which + ]; + doCheck = true; + outputs = [ "out" "dev" "bin" ]; + + enableParallelBuilding = true; + + postPatch = + # Patch Chromium build tools + '' + ( cd src/3rdparty/chromium; patchShebangs . ) + '' + # Patch Chromium build files + + '' + substituteInPlace ./src/3rdparty/chromium/build/common.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/toolchain.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + substituteInPlace ./src/3rdparty/chromium/v8/gypfiles/standalone.gypi \ + --replace /bin/echo ${coreutils}/bin/echo + '' + # Patch library paths in Qt sources + + '' + sed -i \ + -e "s,QLibraryInfo::location(QLibraryInfo::DataPath),QLatin1String(\"$out\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::TranslationsPath),QLatin1String(\"$out/translations\"),g" \ + -e "s,QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath),QLatin1String(\"$out/libexec\"),g" \ + src/core/web_engine_library_info.cpp + '' + # Patch library paths in Chromium sources + + optionalString (!stdenv.isDarwin) '' + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + src/3rdparty/chromium/device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc + ''; + + preConfigure = '' + export MAKEFLAGS=-j$NIX_BUILD_CORES + ''; + + qmakeFlags = + [ + # Use system Ninja because bootstrapping it is fragile + "WEBENGINE_CONFIG+=use_system_ninja" + ] ++ optional enableProprietaryCodecs "WEBENGINE_CONFIG+=use_proprietary_codecs"; + + propagatedBuildInputs = [ + # Image formats + libjpeg libpng libtiff libwebp + + # Video formats + srtp libvpx + + # Audio formats + libopus + + # Text rendering + harfbuzz icu + ] + ++ optionals (!stdenv.isDarwin) [ + dbus zlib minizip snappy nss protobuf jsoncpp libevent + + # Audio formats + alsaLib + + # Text rendering + fontconfig freetype + + libcap + pciutils + + # X11 libs + xlibs.xrandr libXScrnSaver libXcursor libXrandr xlibs.libpciaccess libXtst + xlibs.libXcomposite + ]; + patches = optional stdenv.needsPax ./qtwebengine-paxmark-mksnapshot.patch; + postInstall = '' + cat > $out/libexec/qt.conf < Date: Sat, 24 Jun 2017 15:18:58 -0500 Subject: [PATCH 3/3] khotkeys: fix intermittant parallel build failure --- pkgs/desktops/plasma-5/khotkeys.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index abfb85a867c..c54d5486ee9 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -13,4 +13,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "out" "dev" "bin" ]; + enableParallelBuild = false; }