qt511: Remove package sets
Nothing depends on Qt 5.11 any more
This commit is contained in:
adisbladis
parent
f70c47a901
commit
ab3f50a1c0
@ -1,175 +0,0 @@
|
||||
/*
|
||||
|
||||
# Updates
|
||||
|
||||
Before a major version update, make a copy of this directory. (We like to
|
||||
keep the old version around for a short time after major updates.) Add a
|
||||
top-level attribute to `top-level/all-packages.nix`.
|
||||
|
||||
1. Update the URL in `pkgs/development/libraries/qt-5/$VERSION/fetch.sh`.
|
||||
2. From the top of the Nixpkgs tree, run
|
||||
`./maintainers/scripts/fetch-kde-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
|
||||
3. Check that the new packages build correctly.
|
||||
4. Commit the changes and open a pull request.
|
||||
|
||||
*/
|
||||
|
||||
{
|
||||
newScope,
|
||||
stdenv, fetchurl, fetchFromGitHub, fetchpatch, makeSetupHook, makeWrapper,
|
||||
bison, cups ? null, harfbuzz, libGL, perl,
|
||||
gstreamer, gst-plugins-base, gtk3, dconf,
|
||||
llvmPackages_5,
|
||||
|
||||
# options
|
||||
developerBuild ? false,
|
||||
decryptSslTraffic ? false,
|
||||
debug ? false,
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
let
|
||||
|
||||
qtCompatVersion = srcs.qtbase.version;
|
||||
|
||||
stdenvActual = if stdenv.cc.isClang then llvmPackages_5.stdenv else stdenv;
|
||||
|
||||
mirror = "https://download.qt.io";
|
||||
srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; } // {
|
||||
# Community port of the now unmaintained upstream qtwebkit.
|
||||
qtwebkit = {
|
||||
src = fetchFromGitHub {
|
||||
owner = "annulen";
|
||||
repo = "webkit";
|
||||
rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
|
||||
sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
|
||||
};
|
||||
version = "5.212-alpha-01-26-2018";
|
||||
};
|
||||
};
|
||||
|
||||
patches = {
|
||||
qtbase = [
|
||||
./qtbase.patch
|
||||
./qtbase-fixguicmake.patch
|
||||
];
|
||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||
qtscript = [
|
||||
./qtscript.patch
|
||||
# needed due to changes in gcc 8.3, see https://bugreports.qt.io/browse/QTBUG-74196
|
||||
# fixed in qtscript 5.12.2
|
||||
(fetchpatch {
|
||||
url = "https://github.com/qt/qtscript/commit/97ec1d1882a83c23c91f0f7daea48e05858d8c32.diff";
|
||||
sha256 = "0khrapq13xzvxckzc9l7gqyjwibyd98vyqy6gmyhvsbm2kq8n6wi";
|
||||
})
|
||||
];
|
||||
qtserialport = [ ./qtserialport.patch ];
|
||||
qttools = [ ./qttools.patch ];
|
||||
qtwebengine = [
|
||||
./qtwebengine-no-build-skip.patch
|
||||
./qtwebengine-darwin-no-platform-check.patch
|
||||
# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/707
|
||||
# https://bugreports.qt.io/browse/QTBUG-77037
|
||||
(fetchpatch {
|
||||
name = "fix-build-with-pulseaudio-13.0.patch";
|
||||
url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/qtbug-77037-workaround.patch?h=packages/qt5-webengine&id=fc77d6b3d5ec74e421b58f199efceb2593cbf951";
|
||||
sha256 = "1gv733qfdn9746nbqqxzyjx4ijjqkkb7zb71nxax49nna5bri3am";
|
||||
})
|
||||
];
|
||||
qtwebkit = [ ./qtwebkit.patch ];
|
||||
};
|
||||
|
||||
qtModule =
|
||||
import ../qtModule.nix
|
||||
{
|
||||
inherit perl;
|
||||
inherit (stdenv) lib;
|
||||
# Use a variant of mkDerivation that does not include wrapQtApplications
|
||||
# to avoid cyclic dependencies between Qt modules.
|
||||
mkDerivation =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; wrapQtAppsHook = null; }
|
||||
stdenvActual.mkDerivation;
|
||||
}
|
||||
{ inherit self srcs patches; };
|
||||
|
||||
addPackages = self: with self;
|
||||
let
|
||||
callPackage = self.newScope { inherit qtCompatVersion qtModule srcs; };
|
||||
in {
|
||||
|
||||
mkDerivationWith =
|
||||
import ../mkDerivation.nix
|
||||
{ inherit (stdenv) lib; inherit debug; inherit (self) wrapQtAppsHook; };
|
||||
|
||||
mkDerivation = mkDerivationWith stdenvActual.mkDerivation;
|
||||
|
||||
qtbase = callPackage ../modules/qtbase.nix {
|
||||
inherit (srcs.qtbase) src version;
|
||||
patches = patches.qtbase;
|
||||
inherit bison cups harfbuzz libGL;
|
||||
withGtk3 = true; inherit dconf gtk3;
|
||||
inherit developerBuild decryptSslTraffic;
|
||||
};
|
||||
|
||||
qtcharts = callPackage ../modules/qtcharts.nix {};
|
||||
qtconnectivity = callPackage ../modules/qtconnectivity.nix {};
|
||||
qtdeclarative = callPackage ../modules/qtdeclarative.nix {};
|
||||
qtdoc = callPackage ../modules/qtdoc.nix {};
|
||||
qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {};
|
||||
qtimageformats = callPackage ../modules/qtimageformats.nix {};
|
||||
qtlocation = callPackage ../modules/qtlocation.nix { };
|
||||
qtmacextras = callPackage ../modules/qtmacextras.nix {};
|
||||
qtmultimedia = callPackage ../modules/qtmultimedia.nix {
|
||||
inherit gstreamer gst-plugins-base;
|
||||
};
|
||||
qtnetworkauth = callPackage ../modules/qtnetworkauth.nix {};
|
||||
qtquick1 = null;
|
||||
qtquickcontrols = callPackage ../modules/qtquickcontrols.nix {};
|
||||
qtquickcontrols2 = callPackage ../modules/qtquickcontrols2.nix {};
|
||||
qtscript = callPackage ../modules/qtscript.nix {};
|
||||
qtsensors = callPackage ../modules/qtsensors.nix {};
|
||||
qtserialport = callPackage ../modules/qtserialport.nix {};
|
||||
qtspeech = callPackage ../modules/qtspeech.nix {};
|
||||
qtsvg = callPackage ../modules/qtsvg.nix {};
|
||||
qttools = callPackage ../modules/qttools.nix {};
|
||||
qttranslations = callPackage ../modules/qttranslations.nix {};
|
||||
qtvirtualkeyboard = callPackage ../modules/qtvirtualkeyboard.nix {};
|
||||
qtwayland = callPackage ../modules/qtwayland.nix {};
|
||||
qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
|
||||
qtwebengine = callPackage ../modules/qtwebengine.nix {};
|
||||
qtwebglplugin = callPackage ../modules/qtwebglplugin.nix {};
|
||||
qtwebkit = callPackage ../modules/qtwebkit.nix {};
|
||||
qtwebsockets = callPackage ../modules/qtwebsockets.nix {};
|
||||
qtwebview = callPackage ../modules/qtwebview.nix {};
|
||||
qtx11extras = callPackage ../modules/qtx11extras.nix {};
|
||||
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix {};
|
||||
|
||||
env = callPackage ../qt-env.nix {};
|
||||
full = env "qt-full-${qtbase.version}" ([
|
||||
qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects
|
||||
qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
qtscript qtsensors qtserialport qtsvg qttools qttranslations
|
||||
qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets
|
||||
qtwebview qtx11extras qtxmlpatterns
|
||||
] ++ optional (!stdenv.isDarwin) qtwayland
|
||||
++ optional (stdenv.isDarwin) qtmacextras);
|
||||
|
||||
qmake = makeSetupHook {
|
||||
deps = [ self.qtbase.dev ];
|
||||
substitutions = {
|
||||
fix_qmake_libtool = ../hooks/fix-qmake-libtool.sh;
|
||||
};
|
||||
} ../hooks/qmake-hook.sh;
|
||||
|
||||
wrapQtAppsHook = makeSetupHook {
|
||||
deps =
|
||||
[ self.qtbase.dev makeWrapper ]
|
||||
++ optional stdenv.isLinux self.qtwayland.dev;
|
||||
} ../hooks/wrap-qt-apps-hook.sh;
|
||||
};
|
||||
|
||||
self = makeScope newScope addPackages;
|
||||
|
||||
in self
|
||||
@ -1 +0,0 @@
|
||||
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/ )
|
||||
@ -1,30 +0,0 @@
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
index 0bbc871..3673634 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
|
||||
@@ -286,7 +286,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
|
||||
macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION)
|
||||
set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
|
||||
|
||||
- set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
|
||||
+ set(imported_location \"${PLUGIN_LOCATION}\")
|
||||
_qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
|
||||
set_target_properties(Qt5::${Plugin} PROPERTIES
|
||||
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
|
||||
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
index 5baf0fd..3583745 100644
|
||||
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
|
||||
@@ -2,10 +2,10 @@
|
||||
add_library(Qt5::$$CMAKE_PLUGIN_NAME MODULE IMPORTED)
|
||||
|
||||
!!IF !isEmpty(CMAKE_RELEASE_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
|
||||
!!ENDIF
|
||||
!!IF !isEmpty(CMAKE_DEBUG_TYPE)
|
||||
-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
|
||||
!!ENDIF
|
||||
|
||||
list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,46 +0,0 @@
|
||||
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
|
||||
index 005db4248..685c5b1b2 100644
|
||||
--- a/src/qml/qml/qqmlimport.cpp
|
||||
+++ b/src/qml/qml/qqmlimport.cpp
|
||||
@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
|
||||
QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
|
||||
addImportPath(installImportsPath);
|
||||
|
||||
+ // Add import paths derived from PATH
|
||||
+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
|
||||
+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
|
||||
+ for (const QString &path: paths) {
|
||||
+ if (!path.isEmpty()) {
|
||||
+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
// env import paths
|
||||
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
|
||||
const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
|
||||
diff --git a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||
index 56cb3fb55..74509d601 100644
|
||||
--- a/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||
+++ b/tools/qmlcachegen/Qt5QuickCompilerConfig.cmake
|
||||
@@ -17,7 +17,7 @@ function(QTQUICK_COMPILER_ADD_RESOURCES outfiles)
|
||||
|
||||
find_package(Qt5 COMPONENTS Qml Core)
|
||||
|
||||
- set(compiler_path "${_qt5Core_install_prefix}/bin/qmlcachegen")
|
||||
+ set(compiler_path "qmlcachegen")
|
||||
|
||||
get_target_property(rcc_path ${Qt5Core_RCC_EXECUTABLE} IMPORTED_LOCATION)
|
||||
|
||||
diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
|
||||
index 537eaf62e..e21de58f6 100644
|
||||
--- a/tools/qmlcachegen/qmlcache.prf
|
||||
+++ b/tools/qmlcachegen/qmlcache.prf
|
||||
@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) {
|
||||
}
|
||||
|
||||
qmlcacheinst.base = $$QMLCACHE_DESTDIR
|
||||
-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH
|
||||
+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH
|
||||
qmlcacheinst.CONFIG = no_check_exist
|
||||
|
||||
qmlcachegen.input = CACHEGEN_FILES
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
index 1f6d25e..087c3fb 100644
|
||||
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
|
||||
@@ -81,7 +81,7 @@
|
||||
#include <pthread.h>
|
||||
#elif PLATFORM(GTK)
|
||||
#include <wtf/gtk/GOwnPtr.h>
|
||||
-typedef struct _GMutex GMutex;
|
||||
+typedef union _GMutex GMutex;
|
||||
typedef struct _GCond GCond;
|
||||
#endif
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
|
||||
index af2dab2..8e17f64 100644
|
||||
--- a/src/serialport/qtudev_p.h
|
||||
+++ b/src/serialport/qtudev_p.h
|
||||
@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
|
||||
inline bool resolveSymbols(QLibrary *udevLibrary)
|
||||
{
|
||||
if (!udevLibrary->isLoaded()) {
|
||||
+#ifdef NIXPKGS_LIBUDEV
|
||||
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
|
||||
+#else
|
||||
udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
|
||||
+#endif
|
||||
if (!udevLibrary->load()) {
|
||||
+#ifdef NIXPKGS_LIBUDEV
|
||||
+ udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
|
||||
+#else
|
||||
udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
|
||||
+#endif
|
||||
if (!udevLibrary->load()) {
|
||||
qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
|
||||
return false;
|
||||
@ -1,86 +0,0 @@
|
||||
diff --git a/src/assistant/help/Qt5HelpConfigExtras.cmake.in b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
index 3b97923a..63336bd5 100644
|
||||
--- a/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
+++ b/src/assistant/help/Qt5HelpConfigExtras.cmake.in
|
||||
@@ -2,11 +2,10 @@
|
||||
if (NOT TARGET Qt5::qcollectiongenerator)
|
||||
add_executable(Qt5::qcollectiongenerator IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
+ if(NOT EXISTS \"${imported_location}\")
|
||||
+ set(imported_location \"$${CMAKE_BIN_DIR}qcollectiongenerator$$CMAKE_BIN_SUFFIX\")
|
||||
+ endif()
|
||||
_qt5_Help_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::qcollectiongenerator PROPERTIES
|
||||
@@ -17,11 +16,7 @@ endif()
|
||||
if (NOT TARGET Qt5::qhelpgenerator)
|
||||
add_executable(Qt5::qhelpgenerator IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5Help_install_prefix}/$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}qhelpgenerator$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_Help_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::qhelpgenerator PROPERTIES
|
||||
diff --git a/src/linguist/Qt5LinguistToolsConfig.cmake.in b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
index 4318b16f..d60db4ff 100644
|
||||
--- a/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
+++ b/src/linguist/Qt5LinguistToolsConfig.cmake.in
|
||||
@@ -44,11 +44,7 @@ endmacro()
|
||||
if (NOT TARGET Qt5::lrelease)
|
||||
add_executable(Qt5::lrelease IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lrelease$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lrelease PROPERTIES
|
||||
@@ -59,11 +55,7 @@ endif()
|
||||
if (NOT TARGET Qt5::lupdate)
|
||||
add_executable(Qt5::lupdate IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lupdate$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lupdate PROPERTIES
|
||||
@@ -74,11 +66,7 @@ endif()
|
||||
if (NOT TARGET Qt5::lconvert)
|
||||
add_executable(Qt5::lconvert IMPORTED)
|
||||
|
||||
-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE)
|
||||
- set(imported_location \"${_qt5_linguisttools_install_prefix}/$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ELSE
|
||||
set(imported_location \"$${CMAKE_BIN_DIR}lconvert$$CMAKE_BIN_SUFFIX\")
|
||||
-!!ENDIF
|
||||
_qt5_LinguistTools_check_file_exists(${imported_location})
|
||||
|
||||
set_target_properties(Qt5::lconvert PROPERTIES
|
||||
--- a/src/macdeployqt/shared/shared.cpp
|
||||
+++ b/src/macdeployqt/shared/shared.cpp
|
||||
@@ -1241,6 +1241,12 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf
|
||||
if (!QFile(qmlImportScannerPath).exists())
|
||||
qmlImportScannerPath = QCoreApplication::applicationDirPath() + "/qmlimportscanner";
|
||||
|
||||
+#ifdef NIXPKGS_QMLIMPORTSCANNER
|
||||
+ // Fallback: Nixpkgs hardcoded path
|
||||
+ if (!QFile(qmlImportScannerPath).exists())
|
||||
+ qmlImportScannerPath = NIXPKGS_QMLIMPORTSCANNER;
|
||||
+#endif
|
||||
+
|
||||
// Verify that we found a qmlimportscanner binary
|
||||
if (!QFile(qmlImportScannerPath).exists()) {
|
||||
LogError() << "qmlimportscanner not found at" << qmlImportScannerPath;
|
||||
@ -1,37 +0,0 @@
|
||||
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
|
||||
--- a/mkspecs/features/platform.prf
|
||||
+++ b/mkspecs/features/platform.prf
|
||||
@@ -38,10 +38,6 @@ defineTest(isPlatformSupported) {
|
||||
return(false)
|
||||
}
|
||||
} else:osx {
|
||||
- !isMinXcodeVersion(7, 3) {
|
||||
- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 7.3 is required to build Qt WebEngine.")
|
||||
- return(false)
|
||||
- }
|
||||
!clang|intel_icc {
|
||||
skipBuild("Qt WebEngine on macOS requires Clang.")
|
||||
return(false)
|
||||
@@ -52,10 +48,6 @@ defineTest(isPlatformSupported) {
|
||||
skipBuild("Building Qt WebEngine requires macOS version 10.11 or newer.")
|
||||
return(false)
|
||||
}
|
||||
- !isMinOSXSDKVersion(10, 10): {
|
||||
- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.11 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
|
||||
- return(false)
|
||||
- }
|
||||
} else {
|
||||
skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
|
||||
return(false)
|
||||
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
|
||||
--- a/src/core/config/mac_osx.pri
|
||||
+++ b/src/core/config/mac_osx.pri
|
||||
@@ -5,8 +5,6 @@ load(functions)
|
||||
# otherwise query for it.
|
||||
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
|
||||
isEmpty(QMAKE_MAC_SDK_VERSION) {
|
||||
- QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
|
||||
- isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
|
||||
}
|
||||
|
||||
QMAKE_CLANG_DIR = "/usr"
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/qtwebengine.pro b/qtwebengine.pro
|
||||
--- a/qtwebengine.pro
|
||||
+++ b/qtwebengine.pro
|
||||
@@ -5,7 +5,7 @@ runConfigure()
|
||||
|
||||
!isEmpty(skipBuildReason) {
|
||||
SUBDIRS =
|
||||
- log($${skipBuildReason}$${EOL})
|
||||
+ error($${skipBuildReason}$${EOL})
|
||||
log(QtWebEngine will not be built.$${EOL})
|
||||
}
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff --git a/Source/WebKit2/PlatformQt.cmake b/Source/WebKit2/PlatformQt.cmake
|
||||
--- a/Source/WebKit2/PlatformQt.cmake
|
||||
+++ b/Source/WebKit2/PlatformQt.cmake
|
||||
@@ -261,6 +261,7 @@
|
||||
list(APPEND WebKit2_SYSTEM_INCLUDE_DIRECTORIES
|
||||
${GLIB_INCLUDE_DIRS}
|
||||
${GSTREAMER_INCLUDE_DIRS}
|
||||
+ ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
|
||||
${Qt5Quick_INCLUDE_DIRS}
|
||||
${Qt5Quick_PRIVATE_INCLUDE_DIRS}
|
||||
${SQLITE_INCLUDE_DIR}
|
||||
|
||||
@ -1,325 +0,0 @@
|
||||
# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
|
||||
{ fetchurl, mirror }:
|
||||
|
||||
{
|
||||
qt3d = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1awyv40jgbb30yp5zxf6j9wq96nmk8zyhbh4fpn9gn35ychmr984";
|
||||
name = "qt3d-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtactiveqt = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtactiveqt-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0g35yhp01c34m91fp5vzzq0d2kzz0yswpjjk5cg36j0ddnfcsh4d";
|
||||
name = "qtactiveqt-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtandroidextras = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtandroidextras-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0clqz10ry70f0v8hbw37fhlwrsr5jddg99yjsk9db250dwbqzq27";
|
||||
name = "qtandroidextras-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtbase = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "071yc9iz14qs4s8yvrwllyfdzp5yjxsdpvbjxdrf0g5q69vqigy6";
|
||||
name = "qtbase-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcanvas3d = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0f110z7cmkzns9k00aa5zhzq2fpybfxkd7gdlwzcbhc8hn20986m";
|
||||
name = "qtcanvas3d-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtcharts = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1p4m1nkbbxlkwmbmasx5r83skzssmlcgfzyvj30x2dyrqkmz7627";
|
||||
name = "qtcharts-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtconnectivity = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0amks3qad31i7cha85kvcaxvlmmgkc3gm4jdkw2p02ixxfygr30l";
|
||||
name = "qtconnectivity-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdatavis3d = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdatavis3d-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1kqwr3avcvcyy4i28vjgxk1bsjj9011zr668hsk1zrjxnnwjwdl3";
|
||||
name = "qtdatavis3d-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdeclarative = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1rhsf9bma2zwwpixk2fsg31x7c1pmsk144npypgc9w86swhkc9lf";
|
||||
name = "qtdeclarative-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtdoc = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtdoc-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "06nl8lzrilj8yify5qy4fm9la6dh71aamg19jhvvi657cshiclsq";
|
||||
name = "qtdoc-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgamepad = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgamepad-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1k222cx18zq48sfna91hmy427qzk2n2xz3dlyz59iyz72k6915g9";
|
||||
name = "qtgamepad-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtgraphicaleffects = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1qjpdzkamf27cg5n1wsf0zk939lcgppgydfjzap9s4fxzj1nkn0l";
|
||||
name = "qtgraphicaleffects-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtimageformats = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0zq8igsjyyhxsjr43vpaasrqjw3x0g6rwqf8kaz7y9vs7ny63ch4";
|
||||
name = "qtimageformats-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtlocation = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1sq0f41jwmsimv9a1wl2nk5nifjppm5j92rr4n4s7qwnnjjrir2q";
|
||||
name = "qtlocation-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmacextras = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmacextras-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1j9sqmcwswr8v9z8mcbm10bj7nz8nv9mir0xsc5123ik1gw2c3lk";
|
||||
name = "qtmacextras-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtmultimedia = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0h9wx86zj20n4xc3qnml0i360x2dc1yd2z2af1flj8fwyzppi03j";
|
||||
name = "qtmultimedia-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtnetworkauth = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtnetworkauth-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0dd35698wzg89975vi2ijl2lym495fjizsl03mjixsjnvb1x0q50";
|
||||
name = "qtnetworkauth-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtpurchasing = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtpurchasing-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1fd0gxdj5mrh81iwimq1243i3n47sqv9ik8nslahfh0q3dsx7k8n";
|
||||
name = "qtpurchasing-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0dvmy31qbl76yy0j5y8m7mvnmqyg2c01fmlkn0snvc5h5ah5skjf";
|
||||
name = "qtquickcontrols-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtquickcontrols2 = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "11nhpb0xckv5jjkqj5szr94c2rvyjwr89ch58hh64nsqaav30mpl";
|
||||
name = "qtquickcontrols2-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtremoteobjects = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtremoteobjects-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1d3jzsxfyjhgb6wj9iv1388bv7j6pi08346nmkm1c1a4iykhc0zp";
|
||||
name = "qtremoteobjects-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscript = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "027cvggbcvwyz76cn1bl1zvqg0nq7iica1b7yx7xyy0hb36g715v";
|
||||
name = "qtscript-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtscxml = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1mv8mz36v34dckrzy5r41mq3sqznbalrhndk3avz2154xmkjf5qk";
|
||||
name = "qtscxml-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsensors = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0n88c8xi9pbyh7q1pcqv4yjv6nx62abflj8qgfr4qzb0sp8m6mx7";
|
||||
name = "qtsensors-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialbus = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0vf12jk1ma0v0dlpliw1x9i04iaik1kjkiaby7gaxm2abprxwr2n";
|
||||
name = "qtserialbus-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtserialport = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1nkbfsxzgicwns3k11hhzjxy2hgrigj8xcw2by0jc1j71mnmxi4n";
|
||||
name = "qtserialport-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtspeech = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtspeech-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "158p7zqd0vg55gf88jzc3d4f7649ihh80k0m1q46m2yp6fpdjbxr";
|
||||
name = "qtspeech-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtsvg = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "14a4rprbj9f9rhixbk7143xdz34d7d39xh9v2sc1w43q9sf2rsi1";
|
||||
name = "qtsvg-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qttools = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "13lzdxxi02yhvx4mflhisl6aqv2fiss5m804cqccd1wvp8dyh1f2";
|
||||
name = "qttools-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qttranslations = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qttranslations-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0j8i2kabz22vqb0qj41pkjv848zblqxs71sydc3xcd5av22b517s";
|
||||
name = "qttranslations-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtvirtualkeyboard = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "17jb7cbfy5c19fr9frql6q22in3ra3a4fbff0kjykllxb8j40p4c";
|
||||
name = "qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwayland = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1chz4wchgkzd45h143i5hkqg0whcgdbj37gkg7j4kj31whllzjb2";
|
||||
name = "qtwayland-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebchannel = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1wrdawlqvcw84h8q52mvbjhp1vkd6fhz6c8ijlg9rw0s3fj4y99w";
|
||||
name = "qtwebchannel-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebengine = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1zmqsdais85cdfh2jh8h4a5jcamp1mzdk3vgqm6xnldqf6nrxd2v";
|
||||
name = "qtwebengine-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebglplugin = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebglplugin-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "0wqz8lycmi7pffzy0pz5960w109lbk4mkbw0l1lh64avl6clq7b9";
|
||||
name = "qtwebglplugin-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebsockets = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1ffmapfy68xwwbxbg19ng6b5h8v42cf78s21j7rgq49gm70r0402";
|
||||
name = "qtwebsockets-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwebview = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwebview-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1njmn1n03dp4md8cz58cq2z6bsxd8nwlw0238zmavh7px3jzc9kh";
|
||||
name = "qtwebview-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtwinextras = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtwinextras-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1xf9gc0wqk9jz2ayx29vx0vmm72x9h4qxp2fvgpclns621wyhw72";
|
||||
name = "qtwinextras-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtx11extras = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "11fd2mc20qmnyv1vqhaqad2q6m0i4lmkr432rmqvpkgphpkfp7pr";
|
||||
name = "qtx11extras-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
qtxmlpatterns = {
|
||||
version = "5.11.3";
|
||||
src = fetchurl {
|
||||
url = "${mirror}/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz";
|
||||
sha256 = "1vhfvgi39miqsx3iq7c9sii2sykq0yfng69b70i0smr20zihpl4b";
|
||||
name = "qtxmlpatterns-everywhere-src-5.11.3.tar.xz";
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -13533,23 +13533,6 @@ in
|
||||
developerBuild = true;
|
||||
});
|
||||
|
||||
qt511 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.11) {
|
||||
inherit newScope;
|
||||
inherit stdenv fetchurl fetchFromGitHub fetchpatch makeSetupHook makeWrapper;
|
||||
bison = bison2; # error: too few arguments to function 'int yylex(...
|
||||
inherit cups;
|
||||
harfbuzz = harfbuzzFull;
|
||||
inherit libGL;
|
||||
inherit perl;
|
||||
inherit gtk3;
|
||||
inherit (gnome3) dconf;
|
||||
inherit (gst_all_1) gstreamer gst-plugins-base;
|
||||
inherit llvmPackages_5;
|
||||
});
|
||||
|
||||
libsForQt511 = recurseIntoAttrs (lib.makeScope qt511.newScope mkLibsForQt5);
|
||||
|
||||
qt512 = recurseIntoAttrs (makeOverridable
|
||||
(import ../development/libraries/qt-5/5.12) {
|
||||
inherit newScope;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user