From eb919fa71299edbb7776ecf16ffba177cb4d3e98 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 19:26:29 -0600 Subject: [PATCH 01/59] qt5: 5.14.2 -> 5.15.0 --- .../libraries/qt-5/5.15/default.nix | 176 +++++++ pkgs/development/libraries/qt-5/5.15/fetch.sh | 1 + .../0001-qtbase-mkspecs-mac.patch | 411 ++++++++++++++++ .../5.15/qtbase.patch.d/0002-qtbase-mac.patch | 118 +++++ .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ++++++++++++++++++ .../0004-qtbase-replace-libdir.patch | 68 +++ .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 ++++++++ .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 ++ .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 ++ .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 +++ .../0009-qtbase-qtpluginpath.patch | 33 ++ .../qtbase.patch.d/0010-qtbase-assert.patch | 32 ++ .../0011-fix-header_module.patch | 25 + .../libraries/qt-5/5.15/qtdeclarative.patch | 114 +++++ .../libraries/qt-5/5.15/qtscript.patch | 13 + .../libraries/qt-5/5.15/qtserialport.patch | 22 + .../libraries/qt-5/5.15/qttools.patch | 15 + ...qtwebengine-darwin-no-platform-check.patch | 33 ++ .../5.15/qtwebkit-darwin-no-qos-classes.patch | 11 + .../5.15/qtwebkit-darwin-no-readline.patch | 45 ++ .../libraries/qt-5/5.15/qtwebkit.patch | 12 + pkgs/development/libraries/qt-5/5.15/srcs.nix | 342 +++++++++++++ .../libraries/qt-5/modules/qtbase.nix | 3 - pkgs/top-level/all-packages.nix | 21 +- 24 files changed, 2289 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.15/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.15/fetch.sh create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtscript.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtserialport.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qttools.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/qtwebkit.patch create mode 100644 pkgs/development/libraries/qt-5/5.15/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix new file mode 100644 index 00000000000000..1a90c610a5b53c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -0,0 +1,176 @@ +/* + +# 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, fetchpatch, fetchFromGitHub, 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; } // { + # qtwebkit does not have an official release tarball on the qt mirror and is + # mostly maintained by the community. + qtwebkit = rec { + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebkit"; + rev = "v${version}"; + sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; + }; + version = "5.212.0-alpha4"; + }; + }; + + patches = { + qtbase = + optionals stdenv.isDarwin [ + ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch + ./qtbase.patch.d/0002-qtbase-mac.patch + ] + ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch + ./qtbase.patch.d/0004-qtbase-replace-libdir.patch + ./qtbase.patch.d/0005-qtbase-cmake.patch + ./qtbase.patch.d/0006-qtbase-gtk3.patch + ./qtbase.patch.d/0007-qtbase-xcursor.patch + ./qtbase.patch.d/0008-qtbase-tzdir.patch + ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch + ./qtbase.patch.d/0010-qtbase-assert.patch + ./qtbase.patch.d/0011-fix-header_module.patch + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ ./qtwebkit.patch ] + ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; + qttools = [ ./qttools.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 {}; + qtscxml = callPackage ../modules/qtscxml.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 diff --git a/pkgs/development/libraries/qt-5/5.15/fetch.sh b/pkgs/development/libraries/qt-5/5.15/fetch.sh new file mode 100644 index 00000000000000..97829a133ca50c --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.15/5.15.0/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch new file mode 100644 index 00000000000000..ba4c54b228c8df --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -0,0 +1,411 @@ +From 5ec1d1009d9943f20e82ffc087deabb31d447e75 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:07:58 +0200 +Subject: [PATCH 01/11] qtbase-mkspecs-mac + +--- + mkspecs/common/mac.conf | 2 +- + mkspecs/features/mac/default_post.prf | 206 -------------------------- + mkspecs/features/mac/default_pre.prf | 58 -------- + mkspecs/features/mac/sdk.mk | 25 ---- + mkspecs/features/mac/sdk.prf | 61 -------- + 5 files changed, 1 insertion(+), 351 deletions(-) + delete mode 100644 mkspecs/features/mac/sdk.mk + delete mode 100644 mkspecs/features/mac/sdk.prf + +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index 92a9112bca..b80ec1e801 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -68,212 +68,6 @@ qt { + } + } + +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks +- else: QMAKE_RPATHDIR += @executable_path/../Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- bundle_version = $$VERSION +- isEmpty(bundle_version): bundle_version = 1.0.0 +- +- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator { +- version_identifier = $$simulator.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) +- } else { +- version_identifier = $$device.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) +- } +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -isysroot $$sysroot_path $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { +- # Explicit SDK version has been set, respect that +- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS + generate_xcode_project.target = xcodeproj +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,60 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +deleted file mode 100644 +index c40f58c987..0000000000 +--- a/mkspecs/features/mac/sdk.mk ++++ /dev/null +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +deleted file mode 100644 +index 3a9c2778bb..0000000000 +--- a/mkspecs/features/mac/sdk.prf ++++ /dev/null +@@ -1,61 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- infoarg = --show-sdk-path +- equals(info, "PlatformPath"): \ +- infoarg = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- infoarg = --show-sdk-version +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { +- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL +- sysrootified = +- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +- QMAKE_INCDIR_OPENGL = $$sysrootified +-} +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch new file mode 100644 index 00000000000000..4271b64679d700 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0002-qtbase-mac.patch @@ -0,0 +1,118 @@ +From a9ba67d3db7390d9ddc46751346e70b0a522711a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:15:27 +0200 +Subject: [PATCH 02/11] qtbase-mac + +--- + src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- + src/testlib/qappletestlogger.cpp | 2 +- + src/testlib/qappletestlogger_p.h | 2 +- + src/testlib/qtestcase.cpp | 2 +- + src/testlib/qtestlog.cpp | 2 +- + src/testlib/qtestlog_p.h | 4 ++-- + 6 files changed, 20 insertions(+), 8 deletions(-) + +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index 535d3579b2..3d70bf39c1 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -225,7 +225,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index dfeadebdef..2a74330c1d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h +index 62c6d95c5a..f8e0a3b767 100644 +--- a/src/testlib/qappletestlogger_p.h ++++ b/src/testlib/qappletestlogger_p.h +@@ -57,7 +57,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + class QAppleTestLogger : public QAbstractTestLogger + { + public: +diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp +index f45999c7fa..d5b525dc12 100644 +--- a/src/testlib/qtestcase.cpp ++++ b/src/testlib/qtestcase.cpp +@@ -849,7 +849,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool + + bool addFallbackLogger = !explicitLoggerRequested; + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Any explicitly requested loggers will be added by now, so we can check if they use stdout + const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); + if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index a388780532..63ab965101 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + case QTestLog::TAP: + logger = new QTapTestLogger(filename); + break; +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + case QTestLog::Apple: + logger = new QAppleTestLogger; + break; +diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h +index ddaf14ed9b..0c49c93a88 100644 +--- a/src/testlib/qtestlog_p.h ++++ b/src/testlib/qtestlog_p.h +@@ -74,8 +74,8 @@ public: + Q_DISABLE_COPY_MOVE(QTestLog) + + enum LogMode { +- Plain = 0, XML, LightXML, JUnitXML, CSV, TeamCity, TAP +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++ Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + , Apple + #endif + #if defined(HAVE_XCTEST) +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch new file mode 100644 index 00000000000000..9f8ef67ab5d973 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -0,0 +1,464 @@ +From 82771c437957b3684ce296997d795432756aa8b1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:25:52 +0200 +Subject: [PATCH 03/11] qtbase-mkspecs + +--- + mkspecs/features/create_cmake.prf | 51 +++--------- + .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ + mkspecs/features/qml_module.prf | 2 +- + mkspecs/features/qml_plugin.prf | 2 +- + mkspecs/features/qt_app.prf | 2 +- + mkspecs/features/qt_build_paths.prf | 4 +- + mkspecs/features/qt_docs.prf | 10 +-- + mkspecs/features/qt_example_installs.prf | 2 +- + mkspecs/features/qt_functions.prf | 2 +- + mkspecs/features/qt_installs.prf | 22 ++--- + mkspecs/features/qt_plugin.prf | 2 +- + 11 files changed, 38 insertions(+), 141 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 24ed125f12..f0666a1986 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -77,45 +77,20 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True + +-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ +- CMAKE_BIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True + +-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ +- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ ++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + +-win32:!static:!staticlib { +- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { + + cmake_qt5_plugin_file.files = $$cmake_target_file.output + static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -400,7 +375,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 309798a767..b6c3ab8609 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -2,30 +2,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -145,11 +121,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + IsDebugAndRelease) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps + ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +@@ -209,11 +181,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ENDIF + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) + if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +@@ -229,24 +197,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !no_module_headers + !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE +-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -262,7 +219,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -499,25 +455,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -536,25 +480,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -581,11 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _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/qml_module.prf b/mkspecs/features/qml_module.prf +index c0b50416c9..cabe39b22e 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -51,7 +51,7 @@ builtin_resources { + # Install rules + qmldir.base = $$qmldir_path + qmldir.files = $$qmldir_file +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + + qmlfiles.base = $$_PRO_FILE_PWD_ + qmlfiles.files = $$fq_aux_qml_files +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index 1b67435787..24a1f78c17 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -50,7 +50,7 @@ load(qt_build_paths) + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 095bf15dac..4cc977bea5 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -84,8 +84,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -108,12 +108,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 15b373ba40..5c373fe1d5 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -91,7 +91,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 7777e615bd..abeb03a663 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -87,7 +87,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl + cmd = perl -w $$system_path($${cmd}.pl) +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 1ebca17366..a8f958eae8 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,35 +23,35 @@ + #headers + qt_install_headers { + gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES +- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += gen_headers + + targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES +- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 573d717eea..024c624cb6 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch new file mode 100644 index 00000000000000..bbfc938978734f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -0,0 +1,68 @@ +From 30d3906ff5e8671e9c97c5336c6c549656c0e293 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:27:41 +0200 +Subject: [PATCH 04/11] qtbase-replace-libdir + +--- + mkspecs/features/qt_common.prf | 20 ++------------------ + mkspecs/features/qt_module.prf | 5 +---- + 2 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 8df94aa4ee..414029f31c 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib)|contains(TEMPLATE, aux) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- host_build { +- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] +- qt_libdir = $$[QT_HOST_LIBS] +- } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] +- } ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { +- lib_replace0.match = $$rplbase/lib/ +- lib_replace0.replace = $$qqt_libdir/ +- lib_replace0.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$qqt_libdir ++ lib_replace.replace = $$qt_libdir + } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +- !equals(qt_libdir, $$rplbase/lib) { +- qtlibdir_replace.match = $$qt_libdir +- qtlibdir_replace.replace = $$qqt_libdir +- qtlibdir_replace.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace +- } + } + contains(TEMPLATE, .*lib)|darwin { + if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 828a9621b9..b9e5d35026 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -305,10 +305,7 @@ load(qt_targets) + } + !lib_bundle:unix { + CONFIG += create_libtool +- host_build: \ +- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] +- else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + !isEmpty(lib_replace0.match) { + ltlib_replace0.match = $$lib_replace0.match + ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch new file mode 100644 index 00000000000000..19646df1666ffb --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0005-qtbase-cmake.patch @@ -0,0 +1,194 @@ +From 7871fbcefc7596a458cec005edafd9d4962baea3 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:34:28 -0500 +Subject: [PATCH 05/11] qtbase-cmake + +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- + mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- + src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- + src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- + .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- + src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- + src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 8 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index b6c3ab8609..edb6a89316 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -513,7 +513,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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 b550a52c60..dbd3243885 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + !!ENDIF + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 4c1c3a612b..bb8ab08143 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -6,7 +6,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -21,7 +21,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -38,7 +38,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -121,7 +121,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -135,7 +135,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index a814678f7b..b13b964ec8 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,7 @@ + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..8ad0720c5c 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 83d8004a08..ca0b8e4bfb 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch new file mode 100644 index 00000000000000..48f4c9b3f99ec2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0006-qtbase-gtk3.patch @@ -0,0 +1,48 @@ +From 7a9f4f875053aed8ab387161eea623bf8325cfa8 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:33 -0500 +Subject: [PATCH 06/11] qtbase-gtk3 + +--- + src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index 860fc3a26e..8cd4663d49 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return nullptr; + } +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch new file mode 100644 index 00000000000000..617b0684df657e --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From 707098eada20ba074e642a73248de74407bc261c Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/11] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index 42c7a52bd4..ba670ddb44 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch new file mode 100644 index 00000000000000..319de315bfb793 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0008-qtbase-tzdir.patch @@ -0,0 +1,64 @@ +From da003b582ee8823b29b1ff5c0aca8e06e7741b94 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:36:25 -0500 +Subject: [PATCH 08/11] qtbase-tzdir + +--- + src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 01f9a6cce0..910338205a 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -77,7 +77,11 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -672,20 +676,23 @@ QTzTimeZoneCacheEntry QTzTimeZoneCache::findEntry(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return ret; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- const QByteArray zoneInfo = ianaId.split(',').at(0); +- const char *begin = zoneInfo.constBegin(); +- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() +- && (begin == zoneInfo.constEnd() +- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { +- ret.m_posixRule = ianaId; ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ const QByteArray zoneInfo = ianaId.split(',').at(0); ++ const char *begin = zoneInfo.constBegin(); ++ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() ++ && (begin == zoneInfo.constEnd() ++ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { ++ ret.m_posixRule = ianaId; ++ } ++ return ret; + } +- return ret; + } + } + } +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch new file mode 100644 index 00000000000000..28013ec1048297 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0009-qtbase-qtpluginpath.patch @@ -0,0 +1,33 @@ +From 9fc6efaf774a8716932c98c0b0ea6408ed2614c2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sun, 10 May 2020 12:47:28 +0200 +Subject: [PATCH 09/11] qtbase-qtpluginpath + +--- + src/corelib/kernel/qcoreapplication.cpp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp +index 5fdcc9b914..1a126ef359 100644 +--- a/src/corelib/kernel/qcoreapplication.cpp ++++ b/src/corelib/kernel/qcoreapplication.cpp +@@ -2691,6 +2691,16 @@ QStringList QCoreApplication::libraryPathsLocked() + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), Qt::SkipEmptyParts); +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch new file mode 100644 index 00000000000000..c5b099c4ca3558 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0010-qtbase-assert.patch @@ -0,0 +1,32 @@ +From 015845b3c320d02691f28373097d1e6dbbac79f7 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:37:04 -0500 +Subject: [PATCH 10/11] qtbase-assert + +--- + src/testlib/qtestassert.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch new file mode 100644 index 00000000000000..98738656114de4 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtbase.patch.d/0011-fix-header_module.patch @@ -0,0 +1,25 @@ +From 2bce8511877db1db532e1437e7140b1d55633f86 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 11/11] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index b9e5d35026..9924271042 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.4 + diff --git a/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch new file mode 100644 index 00000000000000..d9c721e6946cd8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtdeclarative.patch @@ -0,0 +1,114 @@ +diff --git a/src/particles/particles.pro b/src/particles/particles.pro +index aaaa83419a..58aee00036 100644 +--- a/src/particles/particles.pro ++++ b/src/particles/particles.pro +@@ -20,6 +20,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2 + QML_IMPORT_NAME = QtQuick.Particles + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qml/qml.pro b/src/qml/qml.pro +index e39a8319b6..90c0331278 100644 +--- a/src/qml/qml.pro ++++ b/src/qml/qml.pro +@@ -72,6 +72,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml + QML_IMPORT_NAME = QtQml + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro +index 4ac093556d..112e2c2be0 100644 +--- a/src/qmlmodels/qmlmodels.pro ++++ b/src/qmlmodels/qmlmodels.pro +@@ -68,6 +68,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2 + QML_IMPORT_NAME = QtQml.Models + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro +index c2e8068fc6..79dba368f7 100644 +--- a/src/qmltest/qmltest.pro ++++ b/src/qmltest/qmltest.pro +@@ -34,7 +34,7 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/Qt/test/qtestroot + QML_IMPORT_NAME = Qt.test.qtestroot + QML_IMPORT_VERSION = 1.0 +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + # Install qmldir + qmldir.files = $$PWD/qmldir +diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro +index 84466062e1..79885455cc 100644 +--- a/src/qmlworkerscript/qmlworkerscript.pro ++++ b/src/qmlworkerscript/qmlworkerscript.pro +@@ -23,6 +23,6 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2 + QML_IMPORT_NAME = QtQml.WorkerScript + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes + + load(qt_module) +diff --git a/src/quick/quick.pro b/src/quick/quick.pro +index f2d49cf939..c401b04c4e 100644 +--- a/src/quick/quick.pro ++++ b/src/quick/quick.pro +@@ -52,4 +52,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2 + QML_IMPORT_NAME = QtQuick + IMPORT_VERSION = 2.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro +index 4dbd3e5e46..0c6b186fc8 100644 +--- a/src/quickshapes/quickshapes.pro ++++ b/src/quickshapes/quickshapes.pro +@@ -36,4 +36,4 @@ QMLTYPES_FILENAME = plugins.qmltypes + QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes + QML_IMPORT_NAME = QtQuick.Shapes + IMPORT_VERSION = 1.$$QT_MINOR_VERSION +-CONFIG += qmltypes install_qmltypes install_metatypes ++CONFIG += qmltypes install_qmltypes +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/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf +index 537eaf62ea..e21de58f64 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 diff --git a/pkgs/development/libraries/qt-5/5.15/qtscript.patch b/pkgs/development/libraries/qt-5/5.15/qtscript.patch new file mode 100644 index 00000000000000..5508dec1280e3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtscript.patch @@ -0,0 +1,13 @@ +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 + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.15/qtserialport.patch b/pkgs/development/libraries/qt-5/5.15/qtserialport.patch new file mode 100644 index 00000000000000..f25524e80bcfe8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtserialport.patch @@ -0,0 +1,22 @@ +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; diff --git a/pkgs/development/libraries/qt-5/5.15/qttools.patch b/pkgs/development/libraries/qt-5/5.15/qttools.patch new file mode 100644 index 00000000000000..8ae12198ca2586 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qttools.patch @@ -0,0 +1,15 @@ +--- 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; diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 00000000000000..546e753144d061 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +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" diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 00000000000000..a7087f517623a2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch new file mode 100644 index 00000000000000..26d189d8601952 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch new file mode 100644 index 00000000000000..b94a4b76cbabad --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/qtwebkit.patch @@ -0,0 +1,12 @@ +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} + diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix new file mode 100644 index 00000000000000..c88e896286eefd --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -0,0 +1,342 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.15 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qt3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd"; + name = "qt3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtactiveqt-everywhere-src-5.15.0.tar.xz"; + sha256 = "1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51"; + name = "qtactiveqt-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtandroidextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671"; + name = "qtandroidextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtbase = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtbase-everywhere-src-5.15.0.tar.xz"; + sha256 = "9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5"; + name = "qtbase-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtcharts = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtcharts-everywhere-src-5.15.0.tar.xz"; + sha256 = "44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7"; + name = "qtcharts-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtconnectivity-everywhere-src-5.15.0.tar.xz"; + sha256 = "f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd"; + name = "qtconnectivity-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3"; + name = "qtdatavis3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdeclarative-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699"; + name = "qtdeclarative-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtdoc = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtdoc-everywhere-src-5.15.0.tar.xz"; + sha256 = "07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f"; + name = "qtdoc-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgamepad = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgamepad-everywhere-src-5.15.0.tar.xz"; + sha256 = "dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a"; + name = "qtgamepad-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + sha256 = "0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda"; + name = "qtgraphicaleffects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtimageformats = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtimageformats-everywhere-src-5.15.0.tar.xz"; + sha256 = "83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8"; + name = "qtimageformats-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlocation = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlocation-everywhere-src-5.15.0.tar.xz"; + sha256 = "c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f"; + name = "qtlocation-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtlottie = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtlottie-everywhere-src-5.15.0.tar.xz"; + sha256 = "2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833"; + name = "qtlottie-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmacextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmacextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439"; + name = "qtmacextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtmultimedia-everywhere-src-5.15.0.tar.xz"; + sha256 = "0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7"; + name = "qtmultimedia-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + sha256 = "96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85"; + name = "qtnetworkauth-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtpurchasing-everywhere-src-5.15.0.tar.xz"; + sha256 = "2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16"; + name = "qtpurchasing-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquick3d = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquick3d-everywhere-src-5.15.0.tar.xz"; + sha256 = "6d3b91b653ba5e33fd5b37cd785ded6cf1dd83d35250c3addb77eb35f90e52cb"; + name = "qtquick3d-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + sha256 = "7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee"; + name = "qtquickcontrols-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + sha256 = "839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f"; + name = "qtquickcontrols2-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtquicktimeline = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + sha256 = "16ffeb733ba15815121fca5705ed5220ce0a0eb2ec0431ad0d55da9426a03c00"; + name = "qtquicktimeline-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + sha256 = "86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf"; + name = "qtremoteobjects-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscript = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscript-everywhere-src-5.15.0.tar.xz"; + sha256 = "02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373"; + name = "qtscript-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtscxml = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtscxml-everywhere-src-5.15.0.tar.xz"; + sha256 = "9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72"; + name = "qtscxml-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsensors = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsensors-everywhere-src-5.15.0.tar.xz"; + sha256 = "12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da"; + name = "qtsensors-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialbus = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialbus-everywhere-src-5.15.0.tar.xz"; + sha256 = "cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379"; + name = "qtserialbus-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtserialport = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtserialport-everywhere-src-5.15.0.tar.xz"; + sha256 = "ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67"; + name = "qtserialport-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtspeech = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtspeech-everywhere-src-5.15.0.tar.xz"; + sha256 = "7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61"; + name = "qtspeech-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtsvg = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtsvg-everywhere-src-5.15.0.tar.xz"; + sha256 = "ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d"; + name = "qtsvg-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttools = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttools-everywhere-src-5.15.0.tar.xz"; + sha256 = "ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437"; + name = "qttools-everywhere-src-5.15.0.tar.xz"; + }; + }; + qttranslations = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qttranslations-everywhere-src-5.15.0.tar.xz"; + sha256 = "45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe"; + name = "qttranslations-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + sha256 = "f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be"; + name = "qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwayland = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwayland-everywhere-src-5.15.0.tar.xz"; + sha256 = "084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb"; + name = "qtwayland-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebchannel-everywhere-src-5.15.0.tar.xz"; + sha256 = "ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f"; + name = "qtwebchannel-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebengine = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebengine-everywhere-src-5.15.0.tar.xz"; + sha256 = "c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df"; + name = "qtwebengine-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + sha256 = "f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15"; + name = "qtwebglplugin-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebsockets-everywhere-src-5.15.0.tar.xz"; + sha256 = "87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092"; + name = "qtwebsockets-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwebview = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwebview-everywhere-src-5.15.0.tar.xz"; + sha256 = "b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660"; + name = "qtwebview-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtwinextras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtwinextras-everywhere-src-5.15.0.tar.xz"; + sha256 = "d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0"; + name = "qtwinextras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtx11extras = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtx11extras-everywhere-src-5.15.0.tar.xz"; + sha256 = "c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1"; + name = "qtx11extras-everywhere-src-5.15.0.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.15.0"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.15/5.15.0/submodules/qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + sha256 = "2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507"; + name = "qtxmlpatterns-everywhere-src-5.15.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 3cbcaaacefb818..9e7d6ae4c2359f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -295,7 +295,6 @@ stdenv.mkDerivation { "-make tools" ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' - "-v" ] ++ ( @@ -312,7 +311,6 @@ stdenv.mkDerivation { [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - "-system-xcb" "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -327,7 +325,6 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" - "-system-libjpeg" "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f1c58a40adf264..69358e30cd7251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14842,11 +14842,28 @@ in inherit llvmPackages_5; }); + qt515 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.15) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); + # TODO bump to 5.14 on darwin once it's not broken; see #95199 - qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt514; - libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt514; + qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515; + libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515; qt5ct = libsForQt5.callPackage ../tools/misc/qt5ct { }; From 2a5f800520e0d03f77558962a609a7e112917d15 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 20:27:00 -0600 Subject: [PATCH 02/59] qt514: remove --- .../libraries/qt-5/5.14/default.nix | 182 ------- pkgs/development/libraries/qt-5/5.14/fetch.sh | 1 - .../0001-qtbase-mkspecs-mac.patch | 411 ---------------- .../5.14/qtbase.patch.d/0002-qtbase-mac.patch | 116 ----- .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ------------------ .../0004-qtbase-replace-libdir.patch | 68 --- .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 -------- .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 -- .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 -- .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 --- .../0009-qtbase-qtpluginpath.patch | 19 - .../qtbase.patch.d/0010-qtbase-assert.patch | 32 -- .../0011-fix-header_module.patch | 25 - .../libraries/qt-5/5.14/qtdeclarative.patch | 33 -- .../libraries/qt-5/5.14/qtscript.patch | 13 - .../libraries/qt-5/5.14/qtserialport.patch | 22 - .../libraries/qt-5/5.14/qttools.patch | 15 - ...qtwebengine-darwin-no-platform-check.patch | 33 -- .../5.14/qtwebkit-darwin-no-qos-classes.patch | 11 - .../5.14/qtwebkit-darwin-no-readline.patch | 45 -- .../libraries/qt-5/5.14/qtwebkit.patch | 12 - pkgs/development/libraries/qt-5/5.14/srcs.nix | 342 ------------- pkgs/top-level/all-packages.nix | 17 - 23 files changed, 2196 deletions(-) delete mode 100644 pkgs/development/libraries/qt-5/5.14/default.nix delete mode 100644 pkgs/development/libraries/qt-5/5.14/fetch.sh delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtscript.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtserialport.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qttools.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit.patch delete mode 100644 pkgs/development/libraries/qt-5/5.14/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix deleted file mode 100644 index 469157a5f72726..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ /dev/null @@ -1,182 +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, fetchpatch, fetchFromGitHub, 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; } // { - # qtwebkit does not have an official release tarball on the qt mirror and is - # mostly maintained by the community. - qtwebkit = rec { - src = fetchFromGitHub { - owner = "qt"; - repo = "qtwebkit"; - rev = "v${version}"; - sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; - }; - version = "5.212.0-alpha4"; - }; - }; - - patches = { - qtbase = - optionals stdenv.isDarwin [ - ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch - ./qtbase.patch.d/0002-qtbase-mac.patch - ] - ++ [ - ./qtbase.patch.d/0003-qtbase-mkspecs.patch - ./qtbase.patch.d/0004-qtbase-replace-libdir.patch - ./qtbase.patch.d/0005-qtbase-cmake.patch - ./qtbase.patch.d/0006-qtbase-gtk3.patch - ./qtbase.patch.d/0007-qtbase-xcursor.patch - ./qtbase.patch.d/0008-qtbase-tzdir.patch - ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch - ./qtbase.patch.d/0010-qtbase-assert.patch - ./qtbase.patch.d/0011-fix-header_module.patch - ]; - qtdeclarative = [ ./qtdeclarative.patch ]; - qtscript = [ ./qtscript.patch ]; - qtserialport = [ ./qtserialport.patch ]; - qtwebengine = [ ] - ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ - (fetchpatch { - name = "qtwebkit-bison-3.7-build.patch"; - url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; - sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; - }) - ./qtwebkit.patch - ] ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; - qttools = [ ./qttools.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 {}; - qtscxml = callPackage ../modules/qtscxml.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 diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh deleted file mode 100644 index 2d266b52977678..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/fetch.sh +++ /dev/null @@ -1 +0,0 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch deleted file mode 100644 index 0951b6646ab7e5..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch +++ /dev/null @@ -1,411 +0,0 @@ -From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:07:58 +0200 -Subject: [PATCH 01/10] qtbase-mkspecs-mac - ---- - mkspecs/common/mac.conf | 2 +- - mkspecs/features/mac/default_post.prf | 206 -------------------------- - mkspecs/features/mac/default_pre.prf | 58 -------- - mkspecs/features/mac/sdk.mk | 25 ---- - mkspecs/features/mac/sdk.prf | 61 -------- - 5 files changed, 1 insertion(+), 351 deletions(-) - delete mode 100644 mkspecs/features/mac/sdk.mk - delete mode 100644 mkspecs/features/mac/sdk.prf - -diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf -index 61bea952b2..9909dae726 100644 ---- a/mkspecs/common/mac.conf -+++ b/mkspecs/common/mac.conf -@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ - - QMAKE_FIX_RPATH = install_name_tool -id - --QMAKE_LFLAGS_RPATH = -Wl,-rpath, -+QMAKE_LFLAGS_RPATH = - QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip - - QMAKE_LFLAGS_REL_RPATH = -diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf -index ba163efc18..b80ec1e801 100644 ---- a/mkspecs/features/mac/default_post.prf -+++ b/mkspecs/features/mac/default_post.prf -@@ -68,212 +68,6 @@ qt { - } - } - --# Add the same default rpaths as Xcode does for new projects. --# This is especially important for iOS/tvOS/watchOS where no other option is possible. --!no_default_rpath { -- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks -- else: QMAKE_RPATHDIR += @executable_path/../Frameworks -- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks --} -- --# Don't pass -headerpad_max_install_names when using Bitcode. --# In that case the linker emits a warning stating that the flag is ignored when --# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). --# Using this flag is also unnecessary in practice on UIKit platforms since they --# are sandboxed, and only UIKit platforms support bitcode to begin with. --!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD -- --app_extension_api_only { -- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION -- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION --} -- --macx-xcode { -- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO -- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ -- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO -- else: \ -- qmake_pkginfo_typeinfo.value = "????" -- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo -- -- bundle_version = $$VERSION -- isEmpty(bundle_version): bundle_version = 1.0.0 -- -- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three -- VER_MAJ = $$member(l, 0, 0) -- VER_MIN = $$member(l, 1, 1) -- VER_PAT = $$member(l, 2, 2) -- unset(l) -- -- qmake_full_version.name = QMAKE_FULL_VERSION -- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} -- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version -- -- qmake_short_version.name = QMAKE_SHORT_VERSION -- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} -- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version -- -- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { -- debug_information_format.name = DEBUG_INFORMATION_FORMAT -- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT -- debug_information_format.build = debug -- QMAKE_MAC_XCODE_SETTINGS += debug_information_format -- } -- -- QMAKE_XCODE_ARCHS = -- -- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" -- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_device -- -- simulator { -- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" -- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS -- QMAKE_MAC_XCODE_SETTINGS += arch_simulator -- } -- -- only_active_arch.name = ONLY_ACTIVE_ARCH -- only_active_arch.value = YES -- only_active_arch.build = debug -- QMAKE_MAC_XCODE_SETTINGS += only_active_arch --} else { -- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS -- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS -- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS -- -- isEmpty(VALID_ARCHS): \ -- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") -- -- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) -- -- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) -- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) -- -- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS -- -- arch_flags = $(EXPORT_ARCH_ARGS) -- -- QMAKE_CFLAGS += $$arch_flags -- QMAKE_CXXFLAGS += $$arch_flags -- QMAKE_LFLAGS += $$arch_flags -- -- QMAKE_PCH_ARCHS = $$VALID_ARCHS -- -- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET -- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET -- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET -- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET -- -- # If we're doing a simulator and device build, device and simulator -- # architectures use different paths and flags for the sysroot and -- # deployment target switch, so we must multiplex them across multiple -- # architectures using -Xarch. Otherwise we fall back to the simple path. -- # This is not strictly necessary, but results in cleaner command lines -- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit -- # individual rules to a different set of architecture(s) from the overall -- # build (such as machtest in QtCore). -- simulator:device { -- QMAKE_XARCH_CFLAGS = -- QMAKE_XARCH_LFLAGS = -- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS -- -- for (arch, VALID_ARCHS) { -- contains(VALID_SIMULATOR_ARCHS, $$arch) { -- sdk = $$simulator.sdk -- version_identifier = $$simulator.deployment_identifier -- } else { -- sdk = $$device.sdk -- version_identifier = $$device.deployment_identifier -- } -- -- version_min_flags = \ -- -Xarch_$${arch} \ -- -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -isysroot$$xcodeSDKInfo(Path, $$sdk) -- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ -- -Xarch_$${arch} \ -- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) -- -- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) -- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) -- -- QMAKE_EXTRA_VARIABLES += \ -- QMAKE_XARCH_CFLAGS_$${arch} \ -- QMAKE_XARCH_LFLAGS_$${arch} -- } -- -- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) -- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) -- } else { -- simulator { -- version_identifier = $$simulator.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) -- } else { -- version_identifier = $$device.deployment_identifier -- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) -- } -- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target -- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag -- QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_path $$version_min_flag -- } -- -- # Enable precompiled headers for multiple architectures -- QMAKE_CFLAGS_USE_PRECOMPILE = -- for (arch, VALID_ARCHS) { -- icc_pch_style: \ -- use_flag = "-pch-use " -- else: \ -- use_flag = -include -- -- # Only use Xarch with multi-arch, as the option confuses ccache -- count(VALID_ARCHS, 1, greaterThan): \ -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- -Xarch_$${arch} -- -- QMAKE_CFLAGS_USE_PRECOMPILE += \ -- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} -- } -- icc_pch_style { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} -- QMAKE_CFLAGS_USE_PRECOMPILE = -- } else { -- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -- } -- -- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} --} -- --!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { -- # Explicit SDK version has been set, respect that -- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version --} -- --cache(QMAKE_XCODE_DEVELOPER_PATH, stash) --!isEmpty(QMAKE_XCODE_VERSION): \ -- cache(QMAKE_XCODE_VERSION, stash) -- --QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() -- --xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER --xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX --isEmpty(xcode_product_bundle_identifier_setting.value): \ -- xcode_product_bundle_identifier_setting.value = "com.yourcompany" --xcode_product_bundle_target = $$QMAKE_BUNDLE --isEmpty(xcode_product_bundle_target): \ -- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} --xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" --QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting -- - !macx-xcode { - generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS - generate_xcode_project.target = xcodeproj -diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf -index e3534561a5..3b01424e67 100644 ---- a/mkspecs/features/mac/default_pre.prf -+++ b/mkspecs/features/mac/default_pre.prf -@@ -1,60 +1,2 @@ - CONFIG = asset_catalogs rez $$CONFIG - load(default_pre) -- --isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { -- # Get path of Xcode's Developer directory -- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") -- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") -- -- # Make sure Xcode path is valid -- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ -- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") --} -- --isEmpty(QMAKE_XCODEBUILD_PATH): \ -- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") -- --!isEmpty(QMAKE_XCODEBUILD_PATH) { -- # Make sure Xcode is set up properly -- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ -- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") -- -- isEmpty(QMAKE_XCODE_VERSION) { -- # Extract Xcode version using xcodebuild -- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") -- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) -- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") -- unset(xcode_version) -- } --} -- --isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { -- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist -- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ -- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") -- -- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ -- cache(QMAKE_TARGET_BUNDLE_PREFIX) --} -- --QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon -- --# Make the default debug info format for static debug builds --# DWARF instead of DWARF with dSYM. This cuts down build times --# for application debug builds significantly, as Xcode doesn't --# have to pull out all the DWARF info from the Qt static libs --# and put it into a dSYM file. We don't need that dSYM file in --# the first place, since the information is available in the --# object files inside the archives (static libraries). --macx-xcode:qtConfig(static): \ -- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf -- --# This variable is used by the xcode_dynamic_library_suffix --# feature, which allows Xcode to choose the Qt libraries to link to --# at build time, depending on the current Xcode SDK and configuration. --QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX -- --xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP --xcode_copy_phase_strip_setting.value = NO --QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting -diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk -deleted file mode 100644 -index c40f58c987..0000000000 ---- a/mkspecs/features/mac/sdk.mk -+++ /dev/null -@@ -1,25 +0,0 @@ -- --ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) -- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 -- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) -- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) -- # We don't want to complain about out of date SDK unless the target needs to be remade. -- # This covers use-cases such as running 'make check' after moving the build to a -- # computer without Xcode or with a different Xcode version. -- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) -- ifeq ($(TARGET_UP_TO_DATE),0) -- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) -- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) -- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) -- else ifneq ($(CURRENT_MAC_SDK_VERSION),) -- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) -- else -- $(info Unknown error resolving current platform SDK version.) -- endif -- $(info This requires a fresh build. Please wipe the build directory completely,) -- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) -- $(error ^) -- endif -- endif --endif -diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf -deleted file mode 100644 -index 3a9c2778bb..0000000000 ---- a/mkspecs/features/mac/sdk.prf -+++ /dev/null -@@ -1,61 +0,0 @@ -- --isEmpty(QMAKE_MAC_SDK): \ -- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") -- --contains(QMAKE_MAC_SDK, .*/.*): \ -- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") -- --defineReplace(xcodeSDKInfo) { -- info = $$1 -- equals(info, "Path"): \ -- infoarg = --show-sdk-path -- equals(info, "PlatformPath"): \ -- infoarg = --show-sdk-platform-path -- equals(info, "SDKVersion"): \ -- infoarg = --show-sdk-version -- sdk = $$2 -- isEmpty(sdk): \ -- sdk = $$QMAKE_MAC_SDK -- -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { -- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") -- # --show-sdk-platform-path won't work for Command Line Tools; this is fine -- # only used by the XCTest backend to testlib -- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ -- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") -- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) -- } -- -- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) --} -- --QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) --QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) --QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) -- --isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { -- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL -- sysrootified = -- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val -- QMAKE_INCDIR_OPENGL = $$sysrootified --} -- --QMAKESPEC_NAME = $$basename(QMAKESPEC) -- --# Resolve SDK version of various tools --for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { -- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} -- !isEmpty($$tool_variable) { -- $$tool = $$eval($$tool_variable) -- next() -- } -- -- value = $$eval($$tool) -- isEmpty(value): next() -- -- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") -- isEmpty(sysrooted): next() -- -- $$tool = $$sysrooted $$member(value, 1, -1) -- cache($$tool_variable, set stash, $$tool) --} --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch deleted file mode 100644 index 2e28466c503254..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch +++ /dev/null @@ -1,116 +0,0 @@ -From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Fri, 3 Apr 2020 21:15:27 +0200 -Subject: [PATCH 02/10] qtbase-mac - ---- - src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- - src/testlib/qappletestlogger.cpp | 2 +- - src/testlib/qappletestlogger_p.h | 2 +- - src/testlib/qtestcase.cpp | 2 +- - src/testlib/qtestlog.cpp | 2 +- - src/testlib/qtestlog_p.h | 2 +- - 6 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h -index 535d3579b2..3d70bf39c1 100644 ---- a/src/corelib/kernel/qcore_mac_p.h -+++ b/src/corelib/kernel/qcore_mac_p.h -@@ -225,7 +225,7 @@ private: - - // -------------------------------------------------------------------------- - --#if !defined(QT_BOOTSTRAPPED) -+#if 0 - - QT_END_NAMESPACE - #include -@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); - - #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); - --#endif // !defined(QT_BOOTSTRAPPED) -+#else // !defined(QT_BOOTSTRAPPED) -+ -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) -+#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) -+ -+#define QT_APPLE_LOG_ACTIVITY2(...) -+#define QT_APPLE_LOG_ACTIVITY1(...) -+#define QT_APPLE_LOG_ACTIVITY(...) -+ -+#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) -+ -+#endif - - // ------------------------------------------------------------------------- - -diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp -index dfeadebdef..2a74330c1d 100644 ---- a/src/testlib/qappletestlogger.cpp -+++ b/src/testlib/qappletestlogger.cpp -@@ -43,7 +43,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - - using namespace QTestPrivate; - -diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h -index 62c6d95c5a..f8e0a3b767 100644 ---- a/src/testlib/qappletestlogger_p.h -+++ b/src/testlib/qappletestlogger_p.h -@@ -57,7 +57,7 @@ - - QT_BEGIN_NAMESPACE - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - class QAppleTestLogger : public QAbstractTestLogger - { - public: -diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp -index 70733a692a..8bcda17858 100644 ---- a/src/testlib/qtestcase.cpp -+++ b/src/testlib/qtestcase.cpp -@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool - - bool addFallbackLogger = !explicitLoggerRequested; - --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - // Any explicitly requested loggers will be added by now, so we can check if they use stdout - const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); - if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { -diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp -index f3ebf343c5..9b4f526b2e 100644 ---- a/src/testlib/qtestlog.cpp -+++ b/src/testlib/qtestlog.cpp -@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) - case QTestLog::TAP: - logger = new QTapTestLogger(filename); - break; --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - case QTestLog::Apple: - logger = new QAppleTestLogger; - break; -diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h -index fff36f290d..f737ccf064 100644 ---- a/src/testlib/qtestlog_p.h -+++ b/src/testlib/qtestlog_p.h -@@ -72,7 +72,7 @@ public: - - enum LogMode { - Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP --#if defined(QT_USE_APPLE_UNIFIED_LOGGING) -+#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 - , Apple - #endif - #if defined(HAVE_XCTEST) --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch deleted file mode 100644 index b704d0dc8722ac..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch +++ /dev/null @@ -1,464 +0,0 @@ -From 1cb5581d7f20bf87ac8d67a7295447a78a1d9645 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Sat, 4 Apr 2020 00:25:52 +0200 -Subject: [PATCH 03/10] qtbase-mkspecs - ---- - mkspecs/features/create_cmake.prf | 51 +++--------- - .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ - mkspecs/features/qml_module.prf | 2 +- - mkspecs/features/qml_plugin.prf | 2 +- - mkspecs/features/qt_app.prf | 2 +- - mkspecs/features/qt_build_paths.prf | 4 +- - mkspecs/features/qt_docs.prf | 10 +-- - mkspecs/features/qt_example_installs.prf | 2 +- - mkspecs/features/qt_functions.prf | 2 +- - mkspecs/features/qt_installs.prf | 22 ++--- - mkspecs/features/qt_plugin.prf | 2 +- - 11 files changed, 38 insertions(+), 141 deletions(-) - -diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 0e71fd0015..ba071d9a70 100644 ---- a/mkspecs/features/create_cmake.prf -+++ b/mkspecs/features/create_cmake.prf -@@ -21,7 +21,7 @@ load(cmake_functions) - # at cmake time whether package has been found via a symlink, and correct - # that to an absolute path. This is only done for installations to - # the /usr or / prefix. --CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) -+CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) - contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR - - CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake -@@ -77,45 +77,20 @@ split_incpath { - $$cmake_extra_source_includes.output - } - --CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { -- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ -- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True --} -+CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ -+CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True - --CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_LIB_DIR,"^\\.\\./.*") { -- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ -- CMAKE_LIB_DIR_IS_ABSOLUTE = True --} else { -- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) -- # We need to go up another two levels because the CMake files are -- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} -- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" --} -+CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ -+CMAKE_BIN_DIR_IS_ABSOLUTE = True - --CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_BIN_DIR, "^\\.\\./.*") { -- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ -- CMAKE_BIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_LIB_DIR_IS_ABSOLUTE = True - --CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) --contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { -- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ -- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True --} -+CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ -+CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True - --win32:!static:!staticlib { -- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) -- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { -- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ -- CMAKE_DLL_DIR_IS_ABSOLUTE = True -- } --} else { -- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR -- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE --} -+CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ -+CMAKE_DLL_DIR_IS_ABSOLUTE = True - - static|staticlib:CMAKE_STATIC_TYPE = true - -@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { - - cmake_qt5_plugin_file.files = $$cmake_target_file.output - static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output -- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - INSTALLS += cmake_qt5_plugin_file - - return() -@@ -396,7 +371,7 @@ exists($$cmake_macros_file.input) { - cmake_qt5_module_files.files += $$cmake_macros_file.output - } - --cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} -+cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} - - # We are generating cmake files. Most developers of Qt are not aware of cmake, - # so we require automatic tests to be available. The only module which should -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 1099a761ce..87679b7e68 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) - message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") - endif() - --!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) --!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ELSE --get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) --# Use original install prefix when loaded through a --# cross-prefix symbolic link such as /lib -> /usr/lib. --get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) --get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) --if(_realCurr STREQUAL _realOrig) -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) --else() -- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --endif() --unset(_realOrig) --unset(_realCurr) --unset(_IMPORT_PREFIX) --!!ENDIF --!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) --get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) --!!ELSE --set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") --!!ENDIF -- - !!IF !equals(TEMPLATE, aux) - # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. - set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") -@@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - IsDebugAndRelease) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) - set(_deps - ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI - !!ENDIF - - !!IF !isEmpty(CMAKE_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") --!!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -@@ -230,24 +198,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !no_module_headers - !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) - set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" - ) - !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" -- ) --!!ELSE -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") --!!ENDIF --!!ELSE --!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) -- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") --!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) -- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" -+ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" - ) - !!ELSE - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") -@@ -263,7 +220,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") - !!ENDIF - !!ENDIF --!!ENDIF - !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) - include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) - !!ENDIF -@@ -465,25 +421,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_DEBUG_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -502,25 +446,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) - !!IF isEmpty(CMAKE_RELEASE_TYPE) - !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ELSE // CMAKE_STATIC_WINDOWS_BUILD - if (EXISTS --!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ELSE - \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" --!!ENDIF - AND EXISTS --!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ELSE - \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) --!!ENDIF - _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD - endif() -@@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - --!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ELSE - set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") --!!ENDIF - _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/qml_module.prf b/mkspecs/features/qml_module.prf -index c0b50416c9..cabe39b22e 100644 ---- a/mkspecs/features/qml_module.prf -+++ b/mkspecs/features/qml_module.prf -@@ -51,7 +51,7 @@ builtin_resources { - # Install rules - qmldir.base = $$qmldir_path - qmldir.files = $$qmldir_file --qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH - - qmlfiles.base = $$_PRO_FILE_PWD_ - qmlfiles.files = $$fq_aux_qml_files -diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf -index f1c5658b04..029595e721 100644 ---- a/mkspecs/features/qml_plugin.prf -+++ b/mkspecs/features/qml_plugin.prf -@@ -50,7 +50,7 @@ load(qt_build_paths) - - DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH - --target.path = $$[QT_INSTALL_QML]/$$TARGETPATH -+target.path = $$NIX_OUTPUT_QML/$$TARGETPATH - INSTALLS += target - - # Some final setup -diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf -index 8354f30eea..62028fef8e 100644 ---- a/mkspecs/features/qt_app.prf -+++ b/mkspecs/features/qt_app.prf -@@ -30,7 +30,7 @@ host_build:force_bootstrap { - target.path = $$[QT_HOST_BINS] - } else { - !build_pass:qtConfig(debug_and_release): CONFIG += release -- target.path = $$[QT_INSTALL_BINS] -+ target.path = $$NIX_OUTPUT_BIN/bin - CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable - } - INSTALLS += target -diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf -index 3bb3823a8e..655b7b7db8 100644 ---- a/mkspecs/features/qt_build_paths.prf -+++ b/mkspecs/features/qt_build_paths.prf -@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ - !force_independent { - # If the module is not built independently, everything ends up in qtbase. - # This is the case in non-prefix builds, except for selected modules. -- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] -- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] -+ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT -+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT - } -diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf -index 095bf15dac..4cc977bea5 100644 ---- a/mkspecs/features/qt_docs.prf -+++ b/mkspecs/features/qt_docs.prf -@@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR - - QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) - !build_online_docs: \ -- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) -+ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) - PREP_DOC_INDEXES = - DOC_INDEXES = - !isEmpty(QTREPOS) { -@@ -84,8 +84,8 @@ DOC_INDEXES = - DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) - } else { - prepare_docs: \ -- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) -+ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) -+ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) - } - - qtattributionsscanner.target = qtattributionsscanner -@@ -108,12 +108,12 @@ prepare_docs { - qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) - - inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR -- inst_html_docs.path = $$[QT_INSTALL_DOCS] -+ inst_html_docs.path = $$NIX_OUTPUT_DOC - inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build - INSTALLS += inst_html_docs - - inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch -- inst_qch_docs.path = $$[QT_INSTALL_DOCS] -+ inst_qch_docs.path = $$NIX_OUTPUT_DOC - inst_qch_docs.CONFIG += no_check_exist no_default_install no_build - INSTALLS += inst_qch_docs - -diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf -index 72b47bce27..d59e949e78 100644 ---- a/mkspecs/features/qt_example_installs.prf -+++ b/mkspecs/features/qt_example_installs.prf -@@ -90,7 +90,7 @@ sourcefiles += \ - $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ - $$DBUS_ADAPTORS $$DBUS_INTERFACES - addInstallFiles(sources.files, $$sourcefiles) --sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase -+sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase - INSTALLS += sources - - check_examples { -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 7777e615bd..abeb03a663 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -87,7 +87,7 @@ defineTest(qtHaveModule) { - defineTest(qtPrepareTool) { - cmd = $$eval(QT_TOOL.$${2}.binary) - isEmpty(cmd) { -- cmd = $$[QT_HOST_BINS]/$$2 -+ cmd = $$system("command -v $$2") - exists($${cmd}.pl) { - $${1}_EXE = $${cmd}.pl - cmd = perl -w $$system_path($${cmd}.pl) -diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf -index 1ebca17366..a8f958eae8 100644 ---- a/mkspecs/features/qt_installs.prf -+++ b/mkspecs/features/qt_installs.prf -@@ -12,16 +12,10 @@ - #library - !qt_no_install_library { - win32 { -- host_build: \ -- dlltarget.path = $$[QT_HOST_BINS] -- else: \ -- dlltarget.path = $$[QT_INSTALL_BINS] -+ dlltarget.path = $$NIX_OUTPUT_BIN/bin - INSTALLS += dlltarget - } -- host_build: \ -- target.path = $$[QT_HOST_LIBS] -- else: \ -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - !static: target.CONFIG = no_dll - INSTALLS += target - } -@@ -29,35 +23,35 @@ - #headers - qt_install_headers { - gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES -- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += gen_headers - - targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES -- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME -+ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME - INSTALLS += targ_headers - - private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES -- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private -+ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private - generated_privates: \ - private_headers.CONFIG += no_check_exist - INSTALLS += private_headers - - qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES -- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa -+ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa - INSTALLS += qpa_headers - } - - #module - qt_install_module { - !isEmpty(MODULE_PRI) { -- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - pritarget.files = $$MODULE_PRI - INSTALLS += pritarget - } else: isEmpty(MODULE_PRIVATE_PRI) { - warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") - } - !isEmpty(MODULE_PRIVATE_PRI) { -- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -+ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules - privpritarget.files = $$MODULE_PRIVATE_PRI - INSTALLS += privpritarget - } -diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf -index 573d717eea..024c624cb6 100644 ---- a/mkspecs/features/qt_plugin.prf -+++ b/mkspecs/features/qt_plugin.prf -@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { - } - } - --target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE -+target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE - INSTALLS += target - - qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch deleted file mode 100644 index 86ea2e75d9be41..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Milan=20P=C3=A4ssler?= -Date: Sat, 4 Apr 2020 00:27:41 +0200 -Subject: [PATCH 04/10] qtbase-replace-libdir - ---- - mkspecs/features/qt_common.prf | 20 ++------------------ - mkspecs/features/qt_module.prf | 5 +---- - 2 files changed, 3 insertions(+), 22 deletions(-) - -diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf -index c24f2c6062..0d72ce7286 100644 ---- a/mkspecs/features/qt_common.prf -+++ b/mkspecs/features/qt_common.prf -@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -- host_build { -- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] -- qt_libdir = $$[QT_HOST_LIBS] -- } else { -- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] -- qt_libdir = $$[QT_INSTALL_LIBS] -- } -+ qt_libdir = $$NIX_OUTPUT_OUT/lib - contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { -- lib_replace0.match = $$rplbase/lib/ -- lib_replace0.replace = $$qqt_libdir/ -- lib_replace0.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 - lib_replace.match = "[^ ']*$$rplbase/lib" - lib_replace.replace = - } else { - lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$qqt_libdir -+ lib_replace.replace = $$qt_libdir - } - lib_replace.CONFIG = path - QMAKE_PRL_INSTALL_REPLACE += lib_replace -- !equals(qt_libdir, $$rplbase/lib) { -- qtlibdir_replace.match = $$qt_libdir -- qtlibdir_replace.replace = $$qqt_libdir -- qtlibdir_replace.CONFIG = path -- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace -- } - } - - # The remainder of this file must not apply to host tools/libraries, -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 828a9621b9..b9e5d35026 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -305,10 +305,7 @@ load(qt_targets) - } - !lib_bundle:unix { - CONFIG += create_libtool -- host_build: \ -- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] -- else: \ -- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" -+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib - !isEmpty(lib_replace0.match) { - ltlib_replace0.match = $$lib_replace0.match - ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch deleted file mode 100644 index 85a72956341722..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:34:28 -0500 -Subject: [PATCH 05/10] qtbase-cmake - ---- - mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- - mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- - src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- - src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- - .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- - src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- - src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- - src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- - 8 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 87679b7e68..57060e6470 100644 ---- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - IsDebugAndRelease) - 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 7b70cfed09..e700cfa539 100644 ---- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in -@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES - !!ENDIF - - !!IF !isEmpty(CMAKE_RELEASE_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - !!IF !isEmpty(CMAKE_DEBUG_TYPE) --_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) - !!ENDIF - - list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) -diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 9b672327ef..319ba94d6d 100644 ---- a/src/corelib/Qt5CoreConfigExtras.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) - add_executable(Qt5::qmake IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) - add_executable(Qt5::moc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) - add_executable(Qt5::rcc IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") - !!ENDIF -@@ -118,7 +118,7 @@ if (NOT TARGET Qt5::WinMain) - !!IF !isEmpty(CMAKE_RELEASE_TYPE) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") - !!ENDIF -@@ -132,7 +132,7 @@ if (NOT TARGET Qt5::WinMain) - set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ELSE - set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -index c357237d0e..6f0c75de3c 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -index 706304cf34..546420f6ad 100644 ---- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in -@@ -1,6 +1,6 @@ - - !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) --set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") -+set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") - !!ELSE - set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") - !!ENDIF -diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in -index 1d947159e2..b36865fc48 100644 ---- a/src/dbus/Qt5DBusConfigExtras.cmake.in -+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in -@@ -2,11 +2,7 @@ - if (NOT TARGET Qt5::qdbuscpp2xml) - add_executable(Qt5::qdbuscpp2xml IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbuscpp2xml PROPERTIES -@@ -17,11 +13,7 @@ endif() - if (NOT TARGET Qt5::qdbusxml2cpp) - add_executable(Qt5::qdbusxml2cpp IMPORTED) - --!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ELSE -- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") --!!ENDIF -+ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") - _qt5_DBus_check_file_exists(${imported_location}) - - set_target_properties(Qt5::qdbusxml2cpp PROPERTIES -diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in -index 84dbbfebd4..8ad0720c5c 100644 ---- a/src/gui/Qt5GuiConfigExtras.cmake.in -+++ b/src/gui/Qt5GuiConfigExtras.cmake.in -@@ -2,7 +2,7 @@ - !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) - - !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) --set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") -+set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ELSE - set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") - !!ENDIF -@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO - set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -+ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ELSE - set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") - !!ENDIF - - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) -- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE - set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF -diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -index 99d87e2e46..a4eab2aa72 100644 ---- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in -+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in -@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) - add_executable(Qt5::uic IMPORTED) - - !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) -- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") -+ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ELSE - set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") - !!ENDIF --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch deleted file mode 100644 index 6ce0e5d0c433c8..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:33 -0500 -Subject: [PATCH 06/10] qtbase-gtk3 - ---- - src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp -index fb1c425d8e..bb8bab9795 100644 ---- a/src/plugins/platformthemes/gtk3/main.cpp -+++ b/src/plugins/platformthemes/gtk3/main.cpp -@@ -39,6 +39,7 @@ - - #include - #include "qgtk3theme.h" -+#include - - QT_BEGIN_NAMESPACE - -@@ -54,8 +55,22 @@ public: - QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) - { - Q_UNUSED(params); -- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) -+ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { -+ -+#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS -+ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); -+ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); -+ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); -+#endif -+ -+#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES -+ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); -+ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); -+ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); -+#endif -+ - return new QGtk3Theme; -+ } - - return 0; - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch deleted file mode 100644 index 6a92a952830382..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:58 -0500 -Subject: [PATCH 07/10] qtbase-xcursor - ---- - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index fbadab4d50..c83ce0af5b 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch deleted file mode 100644 index 71653a0e36e0fb..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:36:25 -0500 -Subject: [PATCH 08/10] qtbase-tzdir - ---- - src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- - 1 file changed, 19 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp -index 3c2695a789..e75735f88f 100644 ---- a/src/corelib/time/qtimezoneprivate_tz.cpp -+++ b/src/corelib/time/qtimezoneprivate_tz.cpp -@@ -75,7 +75,11 @@ typedef QHash QTzTimeZoneHash; - // Parse zone.tab table, assume lists all installed zones, if not will need to read directories - static QTzTimeZoneHash loadTzTimeZones() - { -- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); -+ // Try TZDIR first, in case we're running on NixOS. -+ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); -+ // Fallback to traditional paths in case we are not on NixOS. -+ if (!QFile::exists(path)) -+ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); - if (!QFile::exists(path)) - path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); - -@@ -658,20 +662,23 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) - if (!tzif.open(QIODevice::ReadOnly)) - return; - } else { -- // Open named tz, try modern path first, if fails try legacy path -- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ // Try TZDIR first, in case we're running on NixOS -+ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) { -- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -- const QByteArray zoneInfo = ianaId.split(',').at(0); -- const char *begin = zoneInfo.constBegin(); -- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -- && (begin == zoneInfo.constEnd() -- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -- m_id = m_posixRule = ianaId; -+ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); -+ if (!tzif.open(QIODevice::ReadOnly)) { -+ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ -+ const QByteArray zoneInfo = ianaId.split(',').at(0); -+ const char *begin = zoneInfo.constBegin(); -+ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() -+ && (begin == zoneInfo.constEnd() -+ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { -+ m_id = m_posixRule = ianaId; -+ } -+ return; - } -- return; - } - } - } --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch deleted file mode 100644 index 009fe14838e7cc..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 -+++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 -@@ -2691,6 +2691,16 @@ - QStringList *app_libpaths = new QStringList; - coreappdata()->app_libpaths.reset(app_libpaths); - -+ // Add library paths derived from PATH -+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); -+ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); -+ for (const QString &path: paths) { -+ if (!path.isEmpty()) { -+ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); -+ } -+ } -+ -+ - auto setPathsFromEnv = [&](QString libPathEnv) { - if (!libPathEnv.isEmpty()) { - QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch deleted file mode 100644 index e10f976073261f..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:37:04 -0500 -Subject: [PATCH 09/10] qtbase-assert - ---- - src/testlib/qtestassert.h | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h -index 6498ea84ef..d821ced7fc 100644 ---- a/src/testlib/qtestassert.h -+++ b/src/testlib/qtestassert.h -@@ -44,10 +44,13 @@ - - QT_BEGIN_NAMESPACE - -- -+#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) -+#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) -+#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) -+#else - #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) -- - #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) -+#endif - - QT_END_NAMESPACE - --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch deleted file mode 100644 index 4358097dddf257..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 -From: Will Dietz -Date: Mon, 30 Sep 2019 20:15:40 -0500 -Subject: [PATCH 10/10] fix header_module - ---- - mkspecs/features/qt_module.prf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 16b39031bc..1ac3d6fe59 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -84,7 +84,7 @@ header_module { - CONFIG += qt_no_install_library - - # Allow creation of .prl, .la and .pc files. -- target.path = $$[QT_INSTALL_LIBS] -+ target.path = $$NIX_OUTPUT_OUT/lib - target.CONFIG += dummy_install - INSTALLS += target - } else { --- -2.25.1 - diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch deleted file mode 100644 index 8f5b5d4790fb15..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch +++ /dev/null @@ -1,33 +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/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 diff --git a/pkgs/development/libraries/qt-5/5.14/qtscript.patch b/pkgs/development/libraries/qt-5/5.14/qtscript.patch deleted file mode 100644 index 5508dec1280e3a..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtscript.patch +++ /dev/null @@ -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 - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch deleted file mode 100644 index f25524e80bcfe8..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch +++ /dev/null @@ -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; diff --git a/pkgs/development/libraries/qt-5/5.14/qttools.patch b/pkgs/development/libraries/qt-5/5.14/qttools.patch deleted file mode 100644 index 8ae12198ca2586..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qttools.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- 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; diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch deleted file mode 100644 index 546e753144d061..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf ---- a/mkspecs/features/platform.prf -+++ b/mkspecs/features/platform.prf -@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { - } else:osx { - # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 - !isMinXcodeVersion(8, 3, 3) { -- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") -- return(false) - } - !clang|intel_icc { - skipBuild("Qt WebEngine on macOS requires Clang.") -@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { - return(false) - } - !isMinOSXSDKVersion(10, 12): { -- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") -- return(false) - } - } else { - skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") -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" diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch deleted file mode 100644 index a7087f517623a2..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake ---- a/Source/cmake/OptionsQt.cmake -+++ b/Source/cmake/OptionsQt.cmake -@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) - endif () - - if (APPLE) -- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) - endif () - - if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch deleted file mode 100644 index 26d189d8601952..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt ---- a/Source/JavaScriptCore/shell/CMakeLists.txt -+++ b/Source/JavaScriptCore/shell/CMakeLists.txt -@@ -9,7 +9,6 @@ set(JSC_LIBRARIES - ) - - if (WTF_OS_MAC_OS_X) -- list(APPEND JSC_LIBRARIES edit) - endif () - - if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") -diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h ---- a/Source/WTF/wtf/Platform.h -+++ b/Source/WTF/wtf/Platform.h -@@ -563,7 +563,6 @@ - #if PLATFORM(IOS) - - #define HAVE_NETWORK_EXTENSION 1 --#define HAVE_READLINE 1 - #if USE(APPLE_INTERNAL_SDK) - #define USE_CFNETWORK 1 - #endif -@@ -650,7 +649,6 @@ - #define HAVE_MADV_DONTNEED 1 - #define HAVE_MERGESORT 1 - #define HAVE_PTHREAD_SETNAME_NP 1 --#define HAVE_READLINE 1 - #define HAVE_SYS_TIMEB_H 1 - - #if !PLATFORM(GTK) && !PLATFORM(QT) -diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake ---- a/Source/WTF/wtf/PlatformMac.cmake -+++ b/Source/WTF/wtf/PlatformMac.cmake -@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) - - find_library(COCOA_LIBRARY Cocoa) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) --find_library(READLINE_LIBRARY Readline) - list(APPEND WTF_LIBRARIES - ${COREFOUNDATION_LIBRARY} - ${COCOA_LIBRARY} -- ${READLINE_LIBRARY} - libicucore.dylib - ) - diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch deleted file mode 100644 index b94a4b76cbabad..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch +++ /dev/null @@ -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} - diff --git a/pkgs/development/libraries/qt-5/5.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix deleted file mode 100644 index 6ac958442f49b5..00000000000000 --- a/pkgs/development/libraries/qt-5/5.14/srcs.nix +++ /dev/null @@ -1,342 +0,0 @@ -# DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 -{ fetchurl, mirror }: - -{ - qt3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; - name = "qt3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtactiveqt = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; - sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; - name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtandroidextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; - name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtbase = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; - sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; - name = "qtbase-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtcharts = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; - sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; - name = "qtcharts-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtconnectivity = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; - sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; - name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdatavis3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; - name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdeclarative = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; - sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; - name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtdoc = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; - sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; - name = "qtdoc-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgamepad = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; - sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; - name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtgraphicaleffects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; - name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtimageformats = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; - sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; - name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlocation = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; - sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; - name = "qtlocation-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtlottie = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; - sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; - name = "qtlottie-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmacextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; - name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtmultimedia = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; - sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; - name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtnetworkauth = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; - name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtpurchasing = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; - sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; - name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquick3d = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; - sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; - name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; - name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquickcontrols2 = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; - name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtquicktimeline = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; - name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtremoteobjects = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; - name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscript = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; - sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; - name = "qtscript-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtscxml = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; - sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; - name = "qtscxml-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsensors = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; - sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; - name = "qtsensors-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialbus = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; - sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; - name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtserialport = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; - sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; - name = "qtserialport-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtspeech = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; - sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; - name = "qtspeech-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtsvg = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; - sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; - name = "qtsvg-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttools = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; - sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; - name = "qttools-everywhere-src-5.14.2.tar.xz"; - }; - }; - qttranslations = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; - sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; - name = "qttranslations-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtvirtualkeyboard = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; - name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwayland = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; - sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; - name = "qtwayland-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebchannel = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; - sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; - name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebengine = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; - sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; - name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebglplugin = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; - name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebsockets = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; - sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; - name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwebview = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; - sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; - name = "qtwebview-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtwinextras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; - sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; - name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtx11extras = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; - sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; - name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; - }; - }; - qtxmlpatterns = { - version = "5.14.2"; - src = fetchurl { - url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; - name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; - }; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69358e30cd7251..a77fe01f3f9b51 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14827,21 +14827,6 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); - qt514 = recurseIntoAttrs (makeOverridable - (import ../development/libraries/qt-5/5.14) { - inherit newScope; - inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison; - inherit cups; - inherit dconf; - inherit harfbuzz; - inherit libGL; - inherit perl; - inherit gtk3; - inherit (gst_all_1) gstreamer gst-plugins-base; - inherit llvmPackages_5; - }); - qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; @@ -14857,8 +14842,6 @@ in inherit llvmPackages_5; }); - libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); - libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); # TODO bump to 5.14 on darwin once it's not broken; see #95199 From f299399edb954836e52fa83626dc23b7f52af4d0 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 24 Jul 2020 19:48:25 -0600 Subject: [PATCH 03/59] python.pkgs.pyqt5: 5.14.2 -> 5.15.0 --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- pkgs/development/python-modules/sip/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index ece9ad5b4a3fad..2af28bef0c951a 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.14.2"; + version = "5.15.0"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; + sha256 = "sha256-xvdUiP/VNlpliTvGTqgqaVfbEm+/4zZUvNQ64cMMUvk="; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 2bc8b70e4ca5cf..760c5bca9ee188 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.22"; + version = "4.19.23"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; + sha256 = "sha256-IsqbzsU4gRTkDUqv18zQxP4HIpe2KNDFzfovAQwLx+c="; }; configurePhase = '' From 4c0c44c9359d497d88618beb29c46875062ee29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 25 Jul 2020 07:04:00 +0200 Subject: [PATCH 04/59] tipp10: 3.2.0 -> unstable-20200616 --- pkgs/applications/misc/tipp10/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/tipp10/default.nix b/pkgs/applications/misc/tipp10/default.nix index 4782b90b4a1fa8..689c5aa3a9ef69 100644 --- a/pkgs/applications/misc/tipp10/default.nix +++ b/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "3.2.0"; + version = "unstable-20200616"; src = fetchFromGitLab { owner = "tipp10"; - repo = pname; - rev = "v${version}"; - sha256 = "0fav5jlw6lw78iqrj7a65b8vd50hhyyaqyzmfrvyxirpsqhjk1v7"; + repo = "tipp10"; + rev = "2dd6d45c8a91cff7075675d8875721456cdd5f1b"; + sha256 = "16x51rv4r6cz5vsmrfbakqzbfxy456h82ibzacknp35f41cjdqq4"; }; nativeBuildInputs = [ cmake qttools ]; From 01bcfd3579219d60e5d07df309a000f96b2b658b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 4 Sep 2020 05:13:16 -0500 Subject: [PATCH 05/59] qtwebkit: mark broken with Qt 5.15 --- pkgs/development/libraries/qt-5/modules/qtwebkit.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 1133623483affc..b31e57f38065ef 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -71,5 +71,8 @@ qtModule { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" ''; - meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + meta = { + broken = lib.versionAtLeast qtbase.version "5.15"; + maintainers = with stdenv.lib.maintainers; [ abbradar periklis ]; + }; } From 017e498d023695ae98e418f04ee33dc372473a57 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 4 Sep 2020 05:13:36 -0500 Subject: [PATCH 06/59] Revert "qt514: remove" This reverts commit bec5405fc5449f5eb9103249bf2c5dfed9fdcce9. Qt 5.14 is still supported upstream, so we will not remove it yet. --- .../libraries/qt-5/5.14/default.nix | 182 +++++++ pkgs/development/libraries/qt-5/5.14/fetch.sh | 1 + .../0001-qtbase-mkspecs-mac.patch | 411 ++++++++++++++++ .../5.14/qtbase.patch.d/0002-qtbase-mac.patch | 116 +++++ .../qtbase.patch.d/0003-qtbase-mkspecs.patch | 464 ++++++++++++++++++ .../0004-qtbase-replace-libdir.patch | 68 +++ .../qtbase.patch.d/0005-qtbase-cmake.patch | 194 ++++++++ .../qtbase.patch.d/0006-qtbase-gtk3.patch | 48 ++ .../qtbase.patch.d/0007-qtbase-xcursor.patch | 29 ++ .../qtbase.patch.d/0008-qtbase-tzdir.patch | 64 +++ .../0009-qtbase-qtpluginpath.patch | 19 + .../qtbase.patch.d/0010-qtbase-assert.patch | 32 ++ .../0011-fix-header_module.patch | 25 + .../libraries/qt-5/5.14/qtdeclarative.patch | 33 ++ .../libraries/qt-5/5.14/qtscript.patch | 13 + .../libraries/qt-5/5.14/qtserialport.patch | 22 + .../libraries/qt-5/5.14/qttools.patch | 15 + ...qtwebengine-darwin-no-platform-check.patch | 33 ++ .../5.14/qtwebkit-darwin-no-qos-classes.patch | 11 + .../5.14/qtwebkit-darwin-no-readline.patch | 45 ++ .../libraries/qt-5/5.14/qtwebkit.patch | 12 + pkgs/development/libraries/qt-5/5.14/srcs.nix | 342 +++++++++++++ pkgs/top-level/all-packages.nix | 17 + 23 files changed, 2196 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/5.14/default.nix create mode 100644 pkgs/development/libraries/qt-5/5.14/fetch.sh create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtscript.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtserialport.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qttools.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/qtwebkit.patch create mode 100644 pkgs/development/libraries/qt-5/5.14/srcs.nix diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix new file mode 100644 index 00000000000000..469157a5f72726 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -0,0 +1,182 @@ +/* + +# 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, fetchpatch, fetchFromGitHub, 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; } // { + # qtwebkit does not have an official release tarball on the qt mirror and is + # mostly maintained by the community. + qtwebkit = rec { + src = fetchFromGitHub { + owner = "qt"; + repo = "qtwebkit"; + rev = "v${version}"; + sha256 = "0x8rng96h19xirn7qkz3lydal6v4vn00bcl0s3brz36dfs0z8wpg"; + }; + version = "5.212.0-alpha4"; + }; + }; + + patches = { + qtbase = + optionals stdenv.isDarwin [ + ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch + ./qtbase.patch.d/0002-qtbase-mac.patch + ] + ++ [ + ./qtbase.patch.d/0003-qtbase-mkspecs.patch + ./qtbase.patch.d/0004-qtbase-replace-libdir.patch + ./qtbase.patch.d/0005-qtbase-cmake.patch + ./qtbase.patch.d/0006-qtbase-gtk3.patch + ./qtbase.patch.d/0007-qtbase-xcursor.patch + ./qtbase.patch.d/0008-qtbase-tzdir.patch + ./qtbase.patch.d/0009-qtbase-qtpluginpath.patch + ./qtbase.patch.d/0010-qtbase-assert.patch + ./qtbase.patch.d/0011-fix-header_module.patch + ]; + qtdeclarative = [ ./qtdeclarative.patch ]; + qtscript = [ ./qtscript.patch ]; + qtserialport = [ ./qtserialport.patch ]; + qtwebengine = [ ] + ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; + qttools = [ ./qttools.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 {}; + qtscxml = callPackage ../modules/qtscxml.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 diff --git a/pkgs/development/libraries/qt-5/5.14/fetch.sh b/pkgs/development/libraries/qt-5/5.14/fetch.sh new file mode 100644 index 00000000000000..2d266b52977678 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/ ) diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch new file mode 100644 index 00000000000000..0951b6646ab7e5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch @@ -0,0 +1,411 @@ +From a5848991db270ffdd9f2fa05220475bb3194d12f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:07:58 +0200 +Subject: [PATCH 01/10] qtbase-mkspecs-mac + +--- + mkspecs/common/mac.conf | 2 +- + mkspecs/features/mac/default_post.prf | 206 -------------------------- + mkspecs/features/mac/default_pre.prf | 58 -------- + mkspecs/features/mac/sdk.mk | 25 ---- + mkspecs/features/mac/sdk.prf | 61 -------- + 5 files changed, 1 insertion(+), 351 deletions(-) + delete mode 100644 mkspecs/features/mac/sdk.mk + delete mode 100644 mkspecs/features/mac/sdk.prf + +diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf +index 61bea952b2..9909dae726 100644 +--- a/mkspecs/common/mac.conf ++++ b/mkspecs/common/mac.conf +@@ -23,7 +23,7 @@ QMAKE_INCDIR_OPENGL = \ + + QMAKE_FIX_RPATH = install_name_tool -id + +-QMAKE_LFLAGS_RPATH = -Wl,-rpath, ++QMAKE_LFLAGS_RPATH = + QMAKE_LFLAGS_GCSECTIONS = -Wl,-dead_strip + + QMAKE_LFLAGS_REL_RPATH = +diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf +index ba163efc18..b80ec1e801 100644 +--- a/mkspecs/features/mac/default_post.prf ++++ b/mkspecs/features/mac/default_post.prf +@@ -68,212 +68,6 @@ qt { + } + } + +-# Add the same default rpaths as Xcode does for new projects. +-# This is especially important for iOS/tvOS/watchOS where no other option is possible. +-!no_default_rpath { +- uikit: QMAKE_RPATHDIR += @executable_path/Frameworks +- else: QMAKE_RPATHDIR += @executable_path/../Frameworks +- equals(TEMPLATE, lib):!plugin:lib_bundle: QMAKE_RPATHDIR += @loader_path/Frameworks +-} +- +-# Don't pass -headerpad_max_install_names when using Bitcode. +-# In that case the linker emits a warning stating that the flag is ignored when +-# used with bitcode, for reasons that cannot be determined (rdar://problem/20748962). +-# Using this flag is also unnecessary in practice on UIKit platforms since they +-# are sandboxed, and only UIKit platforms support bitcode to begin with. +-!bitcode: QMAKE_LFLAGS += $$QMAKE_LFLAGS_HEADERPAD +- +-app_extension_api_only { +- QMAKE_CFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_CXXFLAGS_PRECOMPILE += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +- QMAKE_LFLAGS += $$QMAKE_CFLAGS_APPLICATION_EXTENSION +-} +- +-macx-xcode { +- qmake_pkginfo_typeinfo.name = QMAKE_PKGINFO_TYPEINFO +- !isEmpty(QMAKE_PKGINFO_TYPEINFO): \ +- qmake_pkginfo_typeinfo.value = $$QMAKE_PKGINFO_TYPEINFO +- else: \ +- qmake_pkginfo_typeinfo.value = "????" +- QMAKE_MAC_XCODE_SETTINGS += qmake_pkginfo_typeinfo +- +- bundle_version = $$VERSION +- isEmpty(bundle_version): bundle_version = 1.0.0 +- +- l = $$split(bundle_version, '.') 0 0 # make sure there are at least three +- VER_MAJ = $$member(l, 0, 0) +- VER_MIN = $$member(l, 1, 1) +- VER_PAT = $$member(l, 2, 2) +- unset(l) +- +- qmake_full_version.name = QMAKE_FULL_VERSION +- qmake_full_version.value = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT} +- QMAKE_MAC_XCODE_SETTINGS += qmake_full_version +- +- qmake_short_version.name = QMAKE_SHORT_VERSION +- qmake_short_version.value = $${VER_MAJ}.$${VER_MIN} +- QMAKE_MAC_XCODE_SETTINGS += qmake_short_version +- +- !isEmpty(QMAKE_XCODE_DEBUG_INFORMATION_FORMAT) { +- debug_information_format.name = DEBUG_INFORMATION_FORMAT +- debug_information_format.value = $$QMAKE_XCODE_DEBUG_INFORMATION_FORMAT +- debug_information_format.build = debug +- QMAKE_MAC_XCODE_SETTINGS += debug_information_format +- } +- +- QMAKE_XCODE_ARCHS = +- +- arch_device.name = "ARCHS[sdk=$${device.sdk}*]" +- arch_device.value = $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_DEVICE_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_device +- +- simulator { +- arch_simulator.name = "ARCHS[sdk=$${simulator.sdk}*]" +- arch_simulator.value = $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_XCODE_ARCHS += $$QMAKE_APPLE_SIMULATOR_ARCHS +- QMAKE_MAC_XCODE_SETTINGS += arch_simulator +- } +- +- only_active_arch.name = ONLY_ACTIVE_ARCH +- only_active_arch.value = YES +- only_active_arch.build = debug +- QMAKE_MAC_XCODE_SETTINGS += only_active_arch +-} else { +- device|!simulator: VALID_DEVICE_ARCHS = $$QMAKE_APPLE_DEVICE_ARCHS +- simulator: VALID_SIMULATOR_ARCHS = $$QMAKE_APPLE_SIMULATOR_ARCHS +- VALID_ARCHS = $$VALID_DEVICE_ARCHS $$VALID_SIMULATOR_ARCHS +- +- isEmpty(VALID_ARCHS): \ +- error("QMAKE_APPLE_DEVICE_ARCHS or QMAKE_APPLE_SIMULATOR_ARCHS must contain at least one architecture") +- +- single_arch: VALID_ARCHS = $$first(VALID_ARCHS) +- +- ACTIVE_ARCHS = $(filter $(EXPORT_VALID_ARCHS), $(ARCHS)) +- ARCH_ARGS = $(foreach arch, $(if $(EXPORT_ACTIVE_ARCHS), $(EXPORT_ACTIVE_ARCHS), $(EXPORT_VALID_ARCHS)), -arch $(arch)) +- +- QMAKE_EXTRA_VARIABLES += VALID_ARCHS ACTIVE_ARCHS ARCH_ARGS +- +- arch_flags = $(EXPORT_ARCH_ARGS) +- +- QMAKE_CFLAGS += $$arch_flags +- QMAKE_CXXFLAGS += $$arch_flags +- QMAKE_LFLAGS += $$arch_flags +- +- QMAKE_PCH_ARCHS = $$VALID_ARCHS +- +- macos: deployment_target = $$QMAKE_MACOSX_DEPLOYMENT_TARGET +- ios: deployment_target = $$QMAKE_IOS_DEPLOYMENT_TARGET +- tvos: deployment_target = $$QMAKE_TVOS_DEPLOYMENT_TARGET +- watchos: deployment_target = $$QMAKE_WATCHOS_DEPLOYMENT_TARGET +- +- # If we're doing a simulator and device build, device and simulator +- # architectures use different paths and flags for the sysroot and +- # deployment target switch, so we must multiplex them across multiple +- # architectures using -Xarch. Otherwise we fall back to the simple path. +- # This is not strictly necessary, but results in cleaner command lines +- # and makes it easier for people to override EXPORT_VALID_ARCHS to limit +- # individual rules to a different set of architecture(s) from the overall +- # build (such as machtest in QtCore). +- simulator:device { +- QMAKE_XARCH_CFLAGS = +- QMAKE_XARCH_LFLAGS = +- QMAKE_EXTRA_VARIABLES += QMAKE_XARCH_CFLAGS QMAKE_XARCH_LFLAGS +- +- for (arch, VALID_ARCHS) { +- contains(VALID_SIMULATOR_ARCHS, $$arch) { +- sdk = $$simulator.sdk +- version_identifier = $$simulator.deployment_identifier +- } else { +- sdk = $$device.sdk +- version_identifier = $$device.deployment_identifier +- } +- +- version_min_flags = \ +- -Xarch_$${arch} \ +- -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_XARCH_CFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -isysroot$$xcodeSDKInfo(Path, $$sdk) +- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \ +- -Xarch_$${arch} \ +- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk) +- +- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch}) +- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch}) +- +- QMAKE_EXTRA_VARIABLES += \ +- QMAKE_XARCH_CFLAGS_$${arch} \ +- QMAKE_XARCH_LFLAGS_$${arch} +- } +- +- QMAKE_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_CXXFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS) +- QMAKE_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS) +- } else { +- simulator { +- version_identifier = $$simulator.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$simulator.sdk) +- } else { +- version_identifier = $$device.deployment_identifier +- sysroot_path = $$xcodeSDKInfo(Path, $$device.sdk) +- } +- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target +- QMAKE_CFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_CXXFLAGS += -isysroot $$sysroot_path $$version_min_flag +- QMAKE_LFLAGS += -Wl,-syslibroot,$$sysroot_path $$version_min_flag +- } +- +- # Enable precompiled headers for multiple architectures +- QMAKE_CFLAGS_USE_PRECOMPILE = +- for (arch, VALID_ARCHS) { +- icc_pch_style: \ +- use_flag = "-pch-use " +- else: \ +- use_flag = -include +- +- # Only use Xarch with multi-arch, as the option confuses ccache +- count(VALID_ARCHS, 1, greaterThan): \ +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- -Xarch_$${arch} +- +- QMAKE_CFLAGS_USE_PRECOMPILE += \ +- $${use_flag}${QMAKE_PCH_OUTPUT_$${arch}} +- } +- icc_pch_style { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE -include ${QMAKE_PCH_INPUT} +- QMAKE_CFLAGS_USE_PRECOMPILE = +- } else { +- QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE +- } +- +- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT} +-} +- +-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) { +- # Explicit SDK version has been set, respect that +- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version +-} +- +-cache(QMAKE_XCODE_DEVELOPER_PATH, stash) +-!isEmpty(QMAKE_XCODE_VERSION): \ +- cache(QMAKE_XCODE_VERSION, stash) +- +-QMAKE_XCODE_LIBRARY_SUFFIX = $$qtPlatformTargetSuffix() +- +-xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER +-xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX +-isEmpty(xcode_product_bundle_identifier_setting.value): \ +- xcode_product_bundle_identifier_setting.value = "com.yourcompany" +-xcode_product_bundle_target = $$QMAKE_BUNDLE +-isEmpty(xcode_product_bundle_target): \ +- xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +-xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" +-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting +- + !macx-xcode { + generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS + generate_xcode_project.target = xcodeproj +diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf +index e3534561a5..3b01424e67 100644 +--- a/mkspecs/features/mac/default_pre.prf ++++ b/mkspecs/features/mac/default_pre.prf +@@ -1,60 +1,2 @@ + CONFIG = asset_catalogs rez $$CONFIG + load(default_pre) +- +-isEmpty(QMAKE_XCODE_DEVELOPER_PATH) { +- # Get path of Xcode's Developer directory +- QMAKE_XCODE_DEVELOPER_PATH = $$system("/usr/bin/xcode-select --print-path 2>/dev/null") +- isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") +- +- # Make sure Xcode path is valid +- !exists($$QMAKE_XCODE_DEVELOPER_PATH): \ +- error("Xcode is not installed in $${QMAKE_XCODE_DEVELOPER_PATH}. Please use xcode-select to choose Xcode installation path.") +-} +- +-isEmpty(QMAKE_XCODEBUILD_PATH): \ +- QMAKE_XCODEBUILD_PATH = $$system("/usr/bin/xcrun -find xcodebuild 2>/dev/null") +- +-!isEmpty(QMAKE_XCODEBUILD_PATH) { +- # Make sure Xcode is set up properly +- !system("/usr/bin/xcrun xcodebuild -license check 2>/dev/null"): \ +- error("Xcode not set up properly. You need to confirm the license agreement by running 'sudo xcrun xcodebuild -license accept'.") +- +- isEmpty(QMAKE_XCODE_VERSION) { +- # Extract Xcode version using xcodebuild +- xcode_version = $$system("/usr/bin/xcrun xcodebuild -version") +- QMAKE_XCODE_VERSION = $$member(xcode_version, 1) +- isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.") +- unset(xcode_version) +- } +-} +- +-isEmpty(QMAKE_TARGET_BUNDLE_PREFIX) { +- QMAKE_XCODE_PREFERENCES_FILE = $$(HOME)/Library/Preferences/com.apple.dt.Xcode.plist +- exists($$QMAKE_XCODE_PREFERENCES_FILE): \ +- QMAKE_TARGET_BUNDLE_PREFIX = $$system("/usr/libexec/PlistBuddy -c 'print IDETemplateOptions:bundleIdentifierPrefix' $$QMAKE_XCODE_PREFERENCES_FILE 2>/dev/null") +- +- !isEmpty(_QMAKE_CACHE_):!isEmpty(QMAKE_TARGET_BUNDLE_PREFIX): \ +- cache(QMAKE_TARGET_BUNDLE_PREFIX) +-} +- +-QMAKE_ASSET_CATALOGS_APP_ICON = AppIcon +- +-# Make the default debug info format for static debug builds +-# DWARF instead of DWARF with dSYM. This cuts down build times +-# for application debug builds significantly, as Xcode doesn't +-# have to pull out all the DWARF info from the Qt static libs +-# and put it into a dSYM file. We don't need that dSYM file in +-# the first place, since the information is available in the +-# object files inside the archives (static libraries). +-macx-xcode:qtConfig(static): \ +- QMAKE_XCODE_DEBUG_INFORMATION_FORMAT = dwarf +- +-# This variable is used by the xcode_dynamic_library_suffix +-# feature, which allows Xcode to choose the Qt libraries to link to +-# at build time, depending on the current Xcode SDK and configuration. +-QMAKE_XCODE_LIBRARY_SUFFIX_SETTING = QT_LIBRARY_SUFFIX +- +-xcode_copy_phase_strip_setting.name = COPY_PHASE_STRIP +-xcode_copy_phase_strip_setting.value = NO +-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting +diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk +deleted file mode 100644 +index c40f58c987..0000000000 +--- a/mkspecs/features/mac/sdk.mk ++++ /dev/null +@@ -1,25 +0,0 @@ +- +-ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),) +- CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1 +- CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND)) +- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION)) +- # We don't want to complain about out of date SDK unless the target needs to be remade. +- # This covers use-cases such as running 'make check' after moving the build to a +- # computer without Xcode or with a different Xcode version. +- TARGET_UP_TO_DATE := $(shell QT_MAC_SDK_NO_VERSION_CHECK=1 $(MAKE) --question $(QMAKE_TARGET) && echo 1 || echo 0) +- ifeq ($(TARGET_UP_TO_DATE),0) +- ifneq ($(findstring missing DEVELOPER_DIR path,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) is no longer valid.) +- else ifneq ($(findstring SDK "$(EXPORT_QMAKE_MAC_SDK)" cannot be located,$(CURRENT_MAC_SDK_VERSION)),) +- $(info The developer dir $(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) no longer contains the $(EXPORT_QMAKE_MAC_SDK_VERSION) platform SDK.) +- else ifneq ($(CURRENT_MAC_SDK_VERSION),) +- $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).) +- else +- $(info Unknown error resolving current platform SDK version.) +- endif +- $(info This requires a fresh build. Please wipe the build directory completely,) +- $(info including any .qmake.stash and .qmake.cache files generated by qmake.) +- $(error ^) +- endif +- endif +-endif +diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf +deleted file mode 100644 +index 3a9c2778bb..0000000000 +--- a/mkspecs/features/mac/sdk.prf ++++ /dev/null +@@ -1,61 +0,0 @@ +- +-isEmpty(QMAKE_MAC_SDK): \ +- error("QMAKE_MAC_SDK must be set when using CONFIG += sdk.") +- +-contains(QMAKE_MAC_SDK, .*/.*): \ +- error("QMAKE_MAC_SDK can only contain short-form SDK names (eg. macosx, iphoneos)") +- +-defineReplace(xcodeSDKInfo) { +- info = $$1 +- equals(info, "Path"): \ +- infoarg = --show-sdk-path +- equals(info, "PlatformPath"): \ +- infoarg = --show-sdk-platform-path +- equals(info, "SDKVersion"): \ +- infoarg = --show-sdk-version +- sdk = $$2 +- isEmpty(sdk): \ +- sdk = $$QMAKE_MAC_SDK +- +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) { +- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null") +- # --show-sdk-platform-path won't work for Command Line Tools; this is fine +- # only used by the XCTest backend to testlib +- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \ +- error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg") +- cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info}) +- } +- +- return($$eval(QMAKE_MAC_SDK.$${sdk}.$${info})) +-} +- +-QMAKE_MAC_SDK_PATH = $$xcodeSDKInfo(Path) +-QMAKE_MAC_SDK_PLATFORM_PATH = $$xcodeSDKInfo(PlatformPath) +-QMAKE_MAC_SDK_VERSION = $$xcodeSDKInfo(SDKVersion) +- +-isEmpty(QMAKE_EXPORT_INCDIR_OPENGL) { +- QMAKE_EXPORT_INCDIR_OPENGL = $$QMAKE_INCDIR_OPENGL +- sysrootified = +- for(val, QMAKE_INCDIR_OPENGL): sysrootified += $${QMAKE_MAC_SDK_PATH}$$val +- QMAKE_INCDIR_OPENGL = $$sysrootified +-} +- +-QMAKESPEC_NAME = $$basename(QMAKESPEC) +- +-# Resolve SDK version of various tools +-for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_LINK QMAKE_LINK_SHLIB QMAKE_ACTOOL QMAKE_LINK_C QMAKE_LINK_C_SHLIB)) { +- tool_variable = QMAKE_MAC_SDK.$${QMAKESPEC_NAME}.$${QMAKE_MAC_SDK}.$${tool} +- !isEmpty($$tool_variable) { +- $$tool = $$eval($$tool_variable) +- next() +- } +- +- value = $$eval($$tool) +- isEmpty(value): next() +- +- sysrooted = $$system("/usr/bin/xcrun -sdk $$QMAKE_MAC_SDK -find $$first(value) 2>/dev/null") +- isEmpty(sysrooted): next() +- +- $$tool = $$sysrooted $$member(value, 1, -1) +- cache($$tool_variable, set stash, $$tool) +-} +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch new file mode 100644 index 00000000000000..2e28466c503254 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0002-qtbase-mac.patch @@ -0,0 +1,116 @@ +From ccaa916eab33093704293bc911eedd85fbe5f160 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Fri, 3 Apr 2020 21:15:27 +0200 +Subject: [PATCH 02/10] qtbase-mac + +--- + src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++-- + src/testlib/qappletestlogger.cpp | 2 +- + src/testlib/qappletestlogger_p.h | 2 +- + src/testlib/qtestcase.cpp | 2 +- + src/testlib/qtestlog.cpp | 2 +- + src/testlib/qtestlog_p.h | 2 +- + 6 files changed, 19 insertions(+), 7 deletions(-) + +diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h +index 535d3579b2..3d70bf39c1 100644 +--- a/src/corelib/kernel/qcore_mac_p.h ++++ b/src/corelib/kernel/qcore_mac_p.h +@@ -225,7 +225,7 @@ private: + + // -------------------------------------------------------------------------- + +-#if !defined(QT_BOOTSTRAPPED) ++#if 0 + + QT_END_NAMESPACE + #include +@@ -303,7 +303,19 @@ QT_MAC_WEAK_IMPORT(_os_activity_current); + + #define QT_APPLE_SCOPED_LOG_ACTIVITY(...) QAppleLogActivity scopedLogActivity = QT_APPLE_LOG_ACTIVITY(__VA_ARGS__).enter(); + +-#endif // !defined(QT_BOOTSTRAPPED) ++#else // !defined(QT_BOOTSTRAPPED) ++ ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT3(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT2(...) ++#define QT_APPLE_LOG_ACTIVITY_WITH_PARENT(...) ++ ++#define QT_APPLE_LOG_ACTIVITY2(...) ++#define QT_APPLE_LOG_ACTIVITY1(...) ++#define QT_APPLE_LOG_ACTIVITY(...) ++ ++#define QT_APPLE_SCOPED_LOG_ACTIVITY(...) ++ ++#endif + + // ------------------------------------------------------------------------- + +diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp +index dfeadebdef..2a74330c1d 100644 +--- a/src/testlib/qappletestlogger.cpp ++++ b/src/testlib/qappletestlogger.cpp +@@ -43,7 +43,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + + using namespace QTestPrivate; + +diff --git a/src/testlib/qappletestlogger_p.h b/src/testlib/qappletestlogger_p.h +index 62c6d95c5a..f8e0a3b767 100644 +--- a/src/testlib/qappletestlogger_p.h ++++ b/src/testlib/qappletestlogger_p.h +@@ -57,7 +57,7 @@ + + QT_BEGIN_NAMESPACE + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + class QAppleTestLogger : public QAbstractTestLogger + { + public: +diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp +index 70733a692a..8bcda17858 100644 +--- a/src/testlib/qtestcase.cpp ++++ b/src/testlib/qtestcase.cpp +@@ -852,7 +852,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool + + bool addFallbackLogger = !explicitLoggerRequested; + +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + // Any explicitly requested loggers will be added by now, so we can check if they use stdout + const bool safeToAddAppleLogger = !AppleUnifiedLogger::willMirrorToStderr() || !QTestLog::loggerUsingStdout(); + if (safeToAddAppleLogger && QAppleTestLogger::debugLoggingEnabled()) { +diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp +index f3ebf343c5..9b4f526b2e 100644 +--- a/src/testlib/qtestlog.cpp ++++ b/src/testlib/qtestlog.cpp +@@ -465,7 +465,7 @@ void QTestLog::addLogger(LogMode mode, const char *filename) + case QTestLog::TAP: + logger = new QTapTestLogger(filename); + break; +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + case QTestLog::Apple: + logger = new QAppleTestLogger; + break; +diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h +index fff36f290d..f737ccf064 100644 +--- a/src/testlib/qtestlog_p.h ++++ b/src/testlib/qtestlog_p.h +@@ -72,7 +72,7 @@ public: + + enum LogMode { + Plain = 0, XML, LightXML, XunitXML, CSV, TeamCity, TAP +-#if defined(QT_USE_APPLE_UNIFIED_LOGGING) ++#if defined(QT_USE_APPLE_UNIFIED_LOGGING) && 0 + , Apple + #endif + #if defined(HAVE_XCTEST) +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch new file mode 100644 index 00000000000000..b704d0dc8722ac --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0003-qtbase-mkspecs.patch @@ -0,0 +1,464 @@ +From 1cb5581d7f20bf87ac8d67a7295447a78a1d9645 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:25:52 +0200 +Subject: [PATCH 03/10] qtbase-mkspecs + +--- + mkspecs/features/create_cmake.prf | 51 +++--------- + .../data/cmake/Qt5BasicConfig.cmake.in | 80 +------------------ + mkspecs/features/qml_module.prf | 2 +- + mkspecs/features/qml_plugin.prf | 2 +- + mkspecs/features/qt_app.prf | 2 +- + mkspecs/features/qt_build_paths.prf | 4 +- + mkspecs/features/qt_docs.prf | 10 +-- + mkspecs/features/qt_example_installs.prf | 2 +- + mkspecs/features/qt_functions.prf | 2 +- + mkspecs/features/qt_installs.prf | 22 ++--- + mkspecs/features/qt_plugin.prf | 2 +- + 11 files changed, 38 insertions(+), 141 deletions(-) + +diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf +index 0e71fd0015..ba071d9a70 100644 +--- a/mkspecs/features/create_cmake.prf ++++ b/mkspecs/features/create_cmake.prf +@@ -21,7 +21,7 @@ load(cmake_functions) + # at cmake time whether package has been found via a symlink, and correct + # that to an absolute path. This is only done for installations to + # the /usr or / prefix. +-CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$[QT_INSTALL_LIBS]) ++CMAKE_INSTALL_LIBS_DIR = $$cmakeTargetPath($$NIX_OUTPUT_OUT/lib/) + contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR + + CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake +@@ -77,45 +77,20 @@ split_incpath { + $$cmake_extra_source_includes.output + } + +-CMAKE_INCLUDE_DIR = $$cmakeRelativePath($$[QT_INSTALL_HEADERS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*") { +- CMAKE_INCLUDE_DIR = $$[QT_INSTALL_HEADERS]/ +- CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True +-} ++CMAKE_INCLUDE_DIR = $$NIX_OUTPUT_DEV/include/ ++CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True + +-CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_LIB_DIR,"^\\.\\./.*") { +- CMAKE_LIB_DIR = $$[QT_INSTALL_LIBS]/ +- CMAKE_LIB_DIR_IS_ABSOLUTE = True +-} else { +- CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS]) +- # We need to go up another two levels because the CMake files are +- # installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME} +- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../" +-} ++CMAKE_BIN_DIR = $$NIX_OUTPUT_BIN/bin/ ++CMAKE_BIN_DIR_IS_ABSOLUTE = True + +-CMAKE_BIN_DIR = $$cmakeRelativePath($$[QT_HOST_BINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_BIN_DIR, "^\\.\\./.*") { +- CMAKE_BIN_DIR = $$[QT_HOST_BINS]/ +- CMAKE_BIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_LIB_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_LIB_DIR_IS_ABSOLUTE = True + +-CMAKE_PLUGIN_DIR = $$cmakeRelativePath($$[QT_INSTALL_PLUGINS], $$[QT_INSTALL_PREFIX]) +-contains(CMAKE_PLUGIN_DIR, "^\\.\\./.*") { +- CMAKE_PLUGIN_DIR = $$[QT_INSTALL_PLUGINS]/ +- CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True +-} ++CMAKE_PLUGIN_DIR = $$NIX_OUTPUT_PLUGIN/ ++CMAKE_PLUGIN_DIR_IS_ABSOLUTE = True + +-win32:!static:!staticlib { +- CMAKE_DLL_DIR = $$cmakeRelativePath($$[QT_INSTALL_BINS], $$[QT_INSTALL_PREFIX]) +- contains(CMAKE_DLL_DIR, "^\\.\\./.*") { +- CMAKE_DLL_DIR = $$[QT_INSTALL_BINS]/ +- CMAKE_DLL_DIR_IS_ABSOLUTE = True +- } +-} else { +- CMAKE_DLL_DIR = $$CMAKE_LIB_DIR +- CMAKE_DLL_DIR_IS_ABSOLUTE = $$CMAKE_LIB_DIR_IS_ABSOLUTE +-} ++CMAKE_DLL_DIR = $$NIX_OUTPUT_OUT/lib/ ++CMAKE_DLL_DIR_IS_ABSOLUTE = True + + static|staticlib:CMAKE_STATIC_TYPE = true + +@@ -258,7 +233,7 @@ contains(CONFIG, plugin) { + + cmake_qt5_plugin_file.files = $$cmake_target_file.output + static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output +- cmake_qt5_plugin_file.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++ cmake_qt5_plugin_file.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + INSTALLS += cmake_qt5_plugin_file + + return() +@@ -396,7 +371,7 @@ exists($$cmake_macros_file.input) { + cmake_qt5_module_files.files += $$cmake_macros_file.output + } + +-cmake_qt5_module_files.path = $$[QT_INSTALL_LIBS]/cmake/Qt5$${CMAKE_MODULE_NAME} ++cmake_qt5_module_files.path = $$NIX_OUTPUT_OUT/lib/cmake/Qt5$${CMAKE_MODULE_NAME} + + # We are generating cmake files. Most developers of Qt are not aware of cmake, + # so we require automatic tests to be available. The only module which should +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 1099a761ce..87679b7e68 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) + message(FATAL_ERROR \"Qt 5 $${CMAKE_MODULE_NAME} module requires at least CMake version 3.1.0\") + endif() + +-!!IF !isEmpty(CMAKE_USR_MOVE_WORKAROUND) +-!!IF !isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ELSE +-get_filename_component(_IMPORT_PREFIX \"${CMAKE_CURRENT_LIST_FILE}\" PATH) +-# Use original install prefix when loaded through a +-# cross-prefix symbolic link such as /lib -> /usr/lib. +-get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH) +-get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5$${CMAKE_MODULE_NAME}\" REALPATH) +-if(_realCurr STREQUAL _realOrig) +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE) +-else() +- get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-endif() +-unset(_realOrig) +-unset(_realCurr) +-unset(_IMPORT_PREFIX) +-!!ENDIF +-!!ELIF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +-get_filename_component(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE) +-!!ELSE +-set(_qt5$${CMAKE_MODULE_NAME}_install_prefix \"$$[QT_INSTALL_PREFIX]\") +-!!ENDIF +- + !!IF !equals(TEMPLATE, aux) + # For backwards compatibility only. Use Qt5$${CMAKE_MODULE_NAME}_VERSION instead. + set(Qt5$${CMAKE_MODULE_NAME}_VERSION_STRING "$$eval(QT.$${MODULE}.VERSION)") +@@ -146,11 +122,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + IsDebugAndRelease) + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps + ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +@@ -210,11 +182,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + !!ENDIF + + !!IF !isEmpty(CMAKE_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ELSE + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") +-!!ENDIF + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) + if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES +@@ -230,24 +198,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !no_module_headers + !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) + set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" + ) + !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, ., 0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" +- ) +-!!ELSE +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +-!!ENDIF +-!!ELSE +-!!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +- set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}\") +-!!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) +- set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION\" +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_INCLUDE_DIR}$${MODULE_INCNAME}/$$VERSION/$${MODULE_INCNAME}\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/\" ++ \"$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Versions/$$section(VERSION, .,0, 0)/Headers/$$VERSION/$${MODULE_INCNAME}\" + ) + !!ELSE + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") +@@ -263,7 +220,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + set(Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS \"\") + !!ENDIF + !!ENDIF +-!!ENDIF + !!IF !isEmpty(CMAKE_ADD_SOURCE_INCLUDE_DIRS) + include(\"${CMAKE_CURRENT_LIST_DIR}/ExtraSourceIncludes.cmake\" OPTIONAL) + !!ENDIF +@@ -465,25 +421,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_DEBUG_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -502,25 +446,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + !!IF !isEmpty(CMAKE_FIND_OTHER_LIBRARY_BUILD) + !!IF isEmpty(CMAKE_RELEASE_TYPE) + !!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- if (EXISTS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ELSE // CMAKE_STATIC_WINDOWS_BUILD + if (EXISTS +-!!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ELSE + \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" +-!!ENDIF + AND EXISTS +-!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ELSE + \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +-!!ENDIF + _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF // CMAKE_STATIC_WINDOWS_BUILD + endif() +@@ -542,11 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + set_property(TARGET Qt5::${Plugin} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + +-!!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ELSE + set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") +-!!ENDIF + _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/qml_module.prf b/mkspecs/features/qml_module.prf +index c0b50416c9..cabe39b22e 100644 +--- a/mkspecs/features/qml_module.prf ++++ b/mkspecs/features/qml_module.prf +@@ -51,7 +51,7 @@ builtin_resources { + # Install rules + qmldir.base = $$qmldir_path + qmldir.files = $$qmldir_file +-qmldir.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++qmldir.path = $$NIX_OUTPUT_QML/$$TARGETPATH + + qmlfiles.base = $$_PRO_FILE_PWD_ + qmlfiles.files = $$fq_aux_qml_files +diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf +index f1c5658b04..029595e721 100644 +--- a/mkspecs/features/qml_plugin.prf ++++ b/mkspecs/features/qml_plugin.prf +@@ -50,7 +50,7 @@ load(qt_build_paths) + + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH + +-target.path = $$[QT_INSTALL_QML]/$$TARGETPATH ++target.path = $$NIX_OUTPUT_QML/$$TARGETPATH + INSTALLS += target + + # Some final setup +diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf +index 8354f30eea..62028fef8e 100644 +--- a/mkspecs/features/qt_app.prf ++++ b/mkspecs/features/qt_app.prf +@@ -30,7 +30,7 @@ host_build:force_bootstrap { + target.path = $$[QT_HOST_BINS] + } else { + !build_pass:qtConfig(debug_and_release): CONFIG += release +- target.path = $$[QT_INSTALL_BINS] ++ target.path = $$NIX_OUTPUT_BIN/bin + CONFIG += relative_qt_rpath # Qt's tools and apps should be relocatable + } + INSTALLS += target +diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf +index 3bb3823a8e..655b7b7db8 100644 +--- a/mkspecs/features/qt_build_paths.prf ++++ b/mkspecs/features/qt_build_paths.prf +@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \ + !force_independent { + # If the module is not built independently, everything ends up in qtbase. + # This is the case in non-prefix builds, except for selected modules. +- MODULE_BASE_OUTDIR = $$[QT_HOST_PREFIX] +- MODULE_QMAKE_OUTDIR = $$[QT_HOST_PREFIX] ++ MODULE_BASE_OUTDIR = $$NIX_OUTPUT_OUT ++ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT + } +diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf +index 095bf15dac..4cc977bea5 100644 +--- a/mkspecs/features/qt_docs.prf ++++ b/mkspecs/features/qt_docs.prf +@@ -65,7 +65,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR + + QDOC += -outputdir $$shell_quote($$QMAKE_DOCS_OUTPUTDIR) + !build_online_docs: \ +- QDOC += -installdir $$shell_quote($$[QT_INSTALL_DOCS]) ++ QDOC += -installdir $$shell_quote($$NIX_OUTPUT_DOC) + PREP_DOC_INDEXES = + DOC_INDEXES = + !isEmpty(QTREPOS) { +@@ -84,8 +84,8 @@ DOC_INDEXES = + DOC_INDEXES += -indexdir $$shell_quote($$qrep/doc) + } else { + prepare_docs: \ +- PREP_DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) +- DOC_INDEXES += -indexdir $$shell_quote($$[QT_INSTALL_DOCS/get]) ++ PREP_DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) ++ DOC_INDEXES += -indexdir $$shell_quote($$NIX_OUTPUT_DOC) + } + + qtattributionsscanner.target = qtattributionsscanner +@@ -108,12 +108,12 @@ prepare_docs { + qch_docs.commands = $$QHELPGENERATOR $$shell_quote($$QMAKE_DOCS_OUTPUTDIR/$${QMAKE_DOCS_TARGET}.qhp) -o $$shell_quote($$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch) + + inst_html_docs.files = $$QMAKE_DOCS_OUTPUTDIR +- inst_html_docs.path = $$[QT_INSTALL_DOCS] ++ inst_html_docs.path = $$NIX_OUTPUT_DOC + inst_html_docs.CONFIG += no_check_exist directory no_default_install no_build + INSTALLS += inst_html_docs + + inst_qch_docs.files = $$QMAKE_DOCS_BASE_OUTDIR/$${QMAKE_DOCS_TARGET}.qch +- inst_qch_docs.path = $$[QT_INSTALL_DOCS] ++ inst_qch_docs.path = $$NIX_OUTPUT_DOC + inst_qch_docs.CONFIG += no_check_exist no_default_install no_build + INSTALLS += inst_qch_docs + +diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf +index 72b47bce27..d59e949e78 100644 +--- a/mkspecs/features/qt_example_installs.prf ++++ b/mkspecs/features/qt_example_installs.prf +@@ -90,7 +90,7 @@ sourcefiles += \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + addInstallFiles(sources.files, $$sourcefiles) +-sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase ++sources.path = $$NIX_OUTPUT_DEV/share/examples/$$probase + INSTALLS += sources + + check_examples { +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 7777e615bd..abeb03a663 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -87,7 +87,7 @@ defineTest(qtHaveModule) { + defineTest(qtPrepareTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd) { +- cmd = $$[QT_HOST_BINS]/$$2 ++ cmd = $$system("command -v $$2") + exists($${cmd}.pl) { + $${1}_EXE = $${cmd}.pl + cmd = perl -w $$system_path($${cmd}.pl) +diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf +index 1ebca17366..a8f958eae8 100644 +--- a/mkspecs/features/qt_installs.prf ++++ b/mkspecs/features/qt_installs.prf +@@ -12,16 +12,10 @@ + #library + !qt_no_install_library { + win32 { +- host_build: \ +- dlltarget.path = $$[QT_HOST_BINS] +- else: \ +- dlltarget.path = $$[QT_INSTALL_BINS] ++ dlltarget.path = $$NIX_OUTPUT_BIN/bin + INSTALLS += dlltarget + } +- host_build: \ +- target.path = $$[QT_HOST_LIBS] +- else: \ +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + !static: target.CONFIG = no_dll + INSTALLS += target + } +@@ -29,35 +23,35 @@ + #headers + qt_install_headers { + gen_headers.files = $$SYNCQT.GENERATED_HEADER_FILES +- gen_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ gen_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += gen_headers + + targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES +- targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME ++ targ_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME + INSTALLS += targ_headers + + private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES +- private_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private ++ private_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/private + generated_privates: \ + private_headers.CONFIG += no_check_exist + INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES +- qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa ++ qpa_headers.path = $$NIX_OUTPUT_DEV/include/$$MODULE_INCNAME/$$VERSION/$$MODULE_INCNAME/qpa + INSTALLS += qpa_headers + } + + #module + qt_install_module { + !isEmpty(MODULE_PRI) { +- pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ pritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + pritarget.files = $$MODULE_PRI + INSTALLS += pritarget + } else: isEmpty(MODULE_PRIVATE_PRI) { + warning("Project $$basename(_PRO_FILE_) is a module, but has not defined MODULE_PRI, which is required for Qt to expose the module to other projects.") + } + !isEmpty(MODULE_PRIVATE_PRI) { +- privpritarget.path = $$[QT_HOST_DATA]/mkspecs/modules ++ privpritarget.path = $$NIX_OUTPUT_DEV/mkspecs/modules + privpritarget.files = $$MODULE_PRIVATE_PRI + INSTALLS += privpritarget + } +diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf +index 573d717eea..024c624cb6 100644 +--- a/mkspecs/features/qt_plugin.prf ++++ b/mkspecs/features/qt_plugin.prf +@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build { + } + } + +-target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE ++target.path = $$NIX_OUTPUT_PLUGIN/$$PLUGIN_TYPE + INSTALLS += target + + qt_libinfix_plugins: TARGET = $$TARGET$$QT_LIBINFIX +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch new file mode 100644 index 00000000000000..86ea2e75d9be41 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0004-qtbase-replace-libdir.patch @@ -0,0 +1,68 @@ +From 1cae0c31c9849615190ee175ebf929b3aca13fe0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Milan=20P=C3=A4ssler?= +Date: Sat, 4 Apr 2020 00:27:41 +0200 +Subject: [PATCH 04/10] qtbase-replace-libdir + +--- + mkspecs/features/qt_common.prf | 20 ++------------------ + mkspecs/features/qt_module.prf | 5 +---- + 2 files changed, 3 insertions(+), 22 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index c24f2c6062..0d72ce7286 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -31,32 +31,16 @@ contains(TEMPLATE, .*lib) { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR +- host_build { +- qqt_libdir = \$\$\$\$[QT_HOST_LIBS] +- qt_libdir = $$[QT_HOST_LIBS] +- } else { +- qqt_libdir = \$\$\$\$[QT_INSTALL_LIBS] +- qt_libdir = $$[QT_INSTALL_LIBS] +- } ++ qt_libdir = $$NIX_OUTPUT_OUT/lib + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { +- lib_replace0.match = $$rplbase/lib/ +- lib_replace0.replace = $$qqt_libdir/ +- lib_replace0.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += lib_replace0 + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$qqt_libdir ++ lib_replace.replace = $$qt_libdir + } + lib_replace.CONFIG = path + QMAKE_PRL_INSTALL_REPLACE += lib_replace +- !equals(qt_libdir, $$rplbase/lib) { +- qtlibdir_replace.match = $$qt_libdir +- qtlibdir_replace.replace = $$qqt_libdir +- qtlibdir_replace.CONFIG = path +- QMAKE_PRL_INSTALL_REPLACE += qtlibdir_replace +- } + } + + # The remainder of this file must not apply to host tools/libraries, +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 828a9621b9..b9e5d35026 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -305,10 +305,7 @@ load(qt_targets) + } + !lib_bundle:unix { + CONFIG += create_libtool +- host_build: \ +- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS] +- else: \ +- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]" ++ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib + !isEmpty(lib_replace0.match) { + ltlib_replace0.match = $$lib_replace0.match + ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/ +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch new file mode 100644 index 00000000000000..85a72956341722 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0005-qtbase-cmake.patch @@ -0,0 +1,194 @@ +From 7e93d1330e1f8c8cd68334201ad100b8c05c9ab5 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:34:28 -0500 +Subject: [PATCH 05/10] qtbase-cmake + +--- + mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +- + mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in | 4 ++-- + src/corelib/Qt5CoreConfigExtras.cmake.in | 10 +++++----- + src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in | 2 +- + .../Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in | 2 +- + src/dbus/Qt5DBusConfigExtras.cmake.in | 12 ++---------- + src/gui/Qt5GuiConfigExtras.cmake.in | 6 +++--- + src/widgets/Qt5WidgetsConfigExtras.cmake.in | 2 +- + 8 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +index 87679b7e68..57060e6470 100644 +--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +@@ -474,7 +474,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + IsDebugAndRelease) + 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 7b70cfed09..e700cfa539 100644 +--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in ++++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in +@@ -53,10 +53,10 @@ set_property(TARGET Qt5::$$CMAKE_PLUGIN_NAME PROPERTY INTERFACE_SOURCES + !!ENDIF + + !!IF !isEmpty(CMAKE_RELEASE_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + !!IF !isEmpty(CMAKE_DEBUG_TYPE) +-_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) ++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_DIR}$${CMAKE_PLUGIN_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) + !!ENDIF + + list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME) +diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in +index 9b672327ef..319ba94d6d 100644 +--- a/src/corelib/Qt5CoreConfigExtras.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake) + add_executable(Qt5::qmake IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}qmake$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -18,7 +18,7 @@ if (NOT TARGET Qt5::moc) + add_executable(Qt5::moc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}moc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -35,7 +35,7 @@ if (NOT TARGET Qt5::rcc) + add_executable(Qt5::rcc IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}rcc$$CMAKE_BIN_SUFFIX\") + !!ENDIF +@@ -118,7 +118,7 @@ if (NOT TARGET Qt5::WinMain) + !!IF !isEmpty(CMAKE_RELEASE_TYPE) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_RELEASE}\") + !!ENDIF +@@ -132,7 +132,7 @@ if (NOT TARGET Qt5::WinMain) + set_property(TARGET Qt5::WinMain APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Core_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ELSE + set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +index c357237d0e..6f0c75de3c 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_HOST_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_HOST_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +index 706304cf34..546420f6ad 100644 +--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in ++++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in +@@ -1,6 +1,6 @@ + + !!IF isEmpty(CMAKE_INSTALL_DATA_DIR_IS_ABSOLUTE) +-set(_qt5_corelib_extra_includes \"${_qt5Core_install_prefix}/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") ++set(_qt5_corelib_extra_includes \"$$NIX_OUTPUT_DEV/$${CMAKE_INSTALL_DATA_DIR}/mkspecs/$${CMAKE_MKSPEC}\") + !!ELSE + set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\") + !!ENDIF +diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in +index 1d947159e2..b36865fc48 100644 +--- a/src/dbus/Qt5DBusConfigExtras.cmake.in ++++ b/src/dbus/Qt5DBusConfigExtras.cmake.in +@@ -2,11 +2,7 @@ + if (NOT TARGET Qt5::qdbuscpp2xml) + add_executable(Qt5::qdbuscpp2xml IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbuscpp2xml$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbuscpp2xml PROPERTIES +@@ -17,11 +13,7 @@ endif() + if (NOT TARGET Qt5::qdbusxml2cpp) + add_executable(Qt5::qdbusxml2cpp IMPORTED) + +-!!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5DBus_install_prefix}/$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ELSE +- set(imported_location \"$${CMAKE_BIN_DIR}qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") +-!!ENDIF ++ set(imported_location \"$$NIX_OUTPUT_DEV/bin/qdbusxml2cpp$$CMAKE_BIN_SUFFIX\") + _qt5_DBus_check_file_exists(${imported_location}) + + set_target_properties(Qt5::qdbusxml2cpp PROPERTIES +diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in +index 84dbbfebd4..8ad0720c5c 100644 +--- a/src/gui/Qt5GuiConfigExtras.cmake.in ++++ b/src/gui/Qt5GuiConfigExtras.cmake.in +@@ -2,7 +2,7 @@ + !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) + + !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE) +-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\") ++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$NIX_OUTPUT_DEV/$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ELSE + set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\") + !!ENDIF +@@ -17,13 +17,13 @@ macro(_populate_qt5gui_gl_target_properties TargetName Configuration LIB_LOCATIO + set_property(TARGET Qt5::${TargetName} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) + + !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Gui_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") ++ set(imported_location \"$$NIX_OUTPUT_OUT/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ELSE + set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") + !!ENDIF + + !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) +- set(imported_implib \"${_qt5Gui_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") ++ set(imported_implib \"$$NIX_OUTPUT_OUT/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ELSE + set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + !!ENDIF +diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +index 99d87e2e46..a4eab2aa72 100644 +--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in ++++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in +@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic) + add_executable(Qt5::uic IMPORTED) + + !!IF isEmpty(CMAKE_BIN_DIR_IS_ABSOLUTE) +- set(imported_location \"${_qt5Widgets_install_prefix}/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") ++ set(imported_location \"$$NIX_OUTPUT_DEV/$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ELSE + set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\") + !!ENDIF +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch new file mode 100644 index 00000000000000..6ce0e5d0c433c8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0006-qtbase-gtk3.patch @@ -0,0 +1,48 @@ +From 1ad04525cdd342e3c8a750323fb3a61b93fee753 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:33 -0500 +Subject: [PATCH 06/10] qtbase-gtk3 + +--- + src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++- + 1 file changed, 16 insertions(+), 1 deletion(-) + +diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp +index fb1c425d8e..bb8bab9795 100644 +--- a/src/plugins/platformthemes/gtk3/main.cpp ++++ b/src/plugins/platformthemes/gtk3/main.cpp +@@ -39,6 +39,7 @@ + + #include + #include "qgtk3theme.h" ++#include + + QT_BEGIN_NAMESPACE + +@@ -54,8 +55,22 @@ public: + QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) + { + Q_UNUSED(params); +- if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) ++ if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) { ++ ++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS ++ QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':'); ++ XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS); ++ qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':'))); ++#endif ++ ++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES ++ QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':'); ++ GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES); ++ qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':'))); ++#endif ++ + return new QGtk3Theme; ++ } + + return 0; + } +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch new file mode 100644 index 00000000000000..6a92a952830382 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0007-qtbase-xcursor.patch @@ -0,0 +1,29 @@ +From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:35:58 -0500 +Subject: [PATCH 07/10] qtbase-xcursor + +--- + src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp +index fbadab4d50..c83ce0af5b 100644 +--- a/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch new file mode 100644 index 00000000000000..71653a0e36e0fb --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0008-qtbase-tzdir.patch @@ -0,0 +1,64 @@ +From 882343ea200fe28810bf217a820816affe885a39 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:36:25 -0500 +Subject: [PATCH 08/10] qtbase-tzdir + +--- + src/corelib/time/qtimezoneprivate_tz.cpp | 31 +++++++++++++++--------- + 1 file changed, 19 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp +index 3c2695a789..e75735f88f 100644 +--- a/src/corelib/time/qtimezoneprivate_tz.cpp ++++ b/src/corelib/time/qtimezoneprivate_tz.cpp +@@ -75,7 +75,11 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ // Try TZDIR first, in case we're running on NixOS. ++ QString path = QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/zone.tab"); ++ // Fallback to traditional paths in case we are not on NixOS. ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -658,20 +662,23 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first, in case we're running on NixOS ++ tzif.setFileName(QFile::decodeName(qgetenv("TZDIR")) + QStringLiteral("/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); + if (!tzif.open(QIODevice::ReadOnly)) { +- // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ +- const QByteArray zoneInfo = ianaId.split(',').at(0); +- const char *begin = zoneInfo.constBegin(); +- if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() +- && (begin == zoneInfo.constEnd() +- || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { +- m_id = m_posixRule = ianaId; ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ ++ const QByteArray zoneInfo = ianaId.split(',').at(0); ++ const char *begin = zoneInfo.constBegin(); ++ if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() ++ && (begin == zoneInfo.constEnd() ++ || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { ++ m_id = m_posixRule = ianaId; ++ } ++ return; + } +- return; + } + } + } +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch new file mode 100644 index 00000000000000..009fe14838e7cc --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0009-qtbase-qtpluginpath.patch @@ -0,0 +1,19 @@ +--- qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp 2020-03-27 10:49:31.000000000 +0100 ++++ qtbase-everywhere-src-5.14.2/src/corelib/kernel/qcoreapplication.cpp.patched 2020-05-09 15:03:03.968084088 +0200 +@@ -2691,6 +2691,16 @@ + QStringList *app_libpaths = new QStringList; + coreappdata()->app_libpaths.reset(app_libpaths); + ++ // Add library paths derived from PATH ++ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':'); ++ const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX); ++ for (const QString &path: paths) { ++ if (!path.isEmpty()) { ++ app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir)); ++ } ++ } ++ ++ + auto setPathsFromEnv = [&](QString libPathEnv) { + if (!libPathEnv.isEmpty()) { + QStringList paths = libPathEnv.split(QDir::listSeparator(), QString::SkipEmptyParts); diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch new file mode 100644 index 00000000000000..e10f976073261f --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0010-qtbase-assert.patch @@ -0,0 +1,32 @@ +From c8893a4e0a1b46796e39b4a338358fdb45685cba Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Tue, 17 Sep 2019 05:37:04 -0500 +Subject: [PATCH 09/10] qtbase-assert + +--- + src/testlib/qtestassert.h | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h +index 6498ea84ef..d821ced7fc 100644 +--- a/src/testlib/qtestassert.h ++++ b/src/testlib/qtestassert.h +@@ -44,10 +44,13 @@ + + QT_BEGIN_NAMESPACE + +- ++#if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) ++#define QTEST_ASSERT(cond) do { } while ((false) && (cond)) ++#define QTEST_ASSERT_X(cond, where, what) do { } while ((false) && (cond)) ++#else + #define QTEST_ASSERT(cond) do { if (!(cond)) qt_assert(#cond,__FILE__,__LINE__); } while (false) +- + #define QTEST_ASSERT_X(cond, where, what) do { if (!(cond)) qt_assert_x(where, what,__FILE__,__LINE__); } while (false) ++#endif + + QT_END_NAMESPACE + +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch new file mode 100644 index 00000000000000..4358097dddf257 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtbase.patch.d/0011-fix-header_module.patch @@ -0,0 +1,25 @@ +From 4c488fdb457e63924383fb7f8ad45bed3df49480 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Mon, 30 Sep 2019 20:15:40 -0500 +Subject: [PATCH 10/10] fix header_module + +--- + mkspecs/features/qt_module.prf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 16b39031bc..1ac3d6fe59 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -84,7 +84,7 @@ header_module { + CONFIG += qt_no_install_library + + # Allow creation of .prl, .la and .pc files. +- target.path = $$[QT_INSTALL_LIBS] ++ target.path = $$NIX_OUTPUT_OUT/lib + target.CONFIG += dummy_install + INSTALLS += target + } else { +-- +2.25.1 + diff --git a/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch new file mode 100644 index 00000000000000..8f5b5d4790fb15 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtdeclarative.patch @@ -0,0 +1,33 @@ +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/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 diff --git a/pkgs/development/libraries/qt-5/5.14/qtscript.patch b/pkgs/development/libraries/qt-5/5.14/qtscript.patch new file mode 100644 index 00000000000000..5508dec1280e3a --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtscript.patch @@ -0,0 +1,13 @@ +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 + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + diff --git a/pkgs/development/libraries/qt-5/5.14/qtserialport.patch b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch new file mode 100644 index 00000000000000..f25524e80bcfe8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtserialport.patch @@ -0,0 +1,22 @@ +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; diff --git a/pkgs/development/libraries/qt-5/5.14/qttools.patch b/pkgs/development/libraries/qt-5/5.14/qttools.patch new file mode 100644 index 00000000000000..8ae12198ca2586 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qttools.patch @@ -0,0 +1,15 @@ +--- 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; diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch new file mode 100644 index 00000000000000..546e753144d061 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebengine-darwin-no-platform-check.patch @@ -0,0 +1,33 @@ +diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf +--- a/mkspecs/features/platform.prf ++++ b/mkspecs/features/platform.prf +@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { + } else:osx { + # FIXME: Try to get it back down to 8.2 for building on OS X 10.11 + !isMinXcodeVersion(8, 3, 3) { +- skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.") +- return(false) + } + !clang|intel_icc { + skipBuild("Qt WebEngine on macOS requires Clang.") +@@ -54,8 +52,6 @@ defineTest(isPlatformSupported) { + return(false) + } + !isMinOSXSDKVersion(10, 12): { +- skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.") +- return(false) + } + } else { + skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.") +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" diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch new file mode 100644 index 00000000000000..a7087f517623a2 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-qos-classes.patch @@ -0,0 +1,11 @@ +diff --git a/Source/cmake/OptionsQt.cmake b/Source/cmake/OptionsQt.cmake +--- a/Source/cmake/OptionsQt.cmake ++++ b/Source/cmake/OptionsQt.cmake +@@ -683,7 +683,6 @@ if (WIN32 AND COMPILER_IS_GCC_OR_CLANG) + endif () + + if (APPLE) +- SET_AND_EXPOSE_TO_BUILD(HAVE_QOS_CLASSES 1) + endif () + + if (ENABLE_MATHML) diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch new file mode 100644 index 00000000000000..26d189d8601952 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit-darwin-no-readline.patch @@ -0,0 +1,45 @@ +diff --git a/Source/JavaScriptCore/shell/CMakeLists.txt b/Source/JavaScriptCore/shell/CMakeLists.txt +--- a/Source/JavaScriptCore/shell/CMakeLists.txt ++++ b/Source/JavaScriptCore/shell/CMakeLists.txt +@@ -9,7 +9,6 @@ set(JSC_LIBRARIES + ) + + if (WTF_OS_MAC_OS_X) +- list(APPEND JSC_LIBRARIES edit) + endif () + + if ("${JavaScriptCore_LIBRARY_TYPE}" MATCHES "STATIC") +diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h +--- a/Source/WTF/wtf/Platform.h ++++ b/Source/WTF/wtf/Platform.h +@@ -563,7 +563,6 @@ + #if PLATFORM(IOS) + + #define HAVE_NETWORK_EXTENSION 1 +-#define HAVE_READLINE 1 + #if USE(APPLE_INTERNAL_SDK) + #define USE_CFNETWORK 1 + #endif +@@ -650,7 +649,6 @@ + #define HAVE_MADV_DONTNEED 1 + #define HAVE_MERGESORT 1 + #define HAVE_PTHREAD_SETNAME_NP 1 +-#define HAVE_READLINE 1 + #define HAVE_SYS_TIMEB_H 1 + + #if !PLATFORM(GTK) && !PLATFORM(QT) +diff --git a/Source/WTF/wtf/PlatformMac.cmake b/Source/WTF/wtf/PlatformMac.cmake +--- a/Source/WTF/wtf/PlatformMac.cmake ++++ b/Source/WTF/wtf/PlatformMac.cmake +@@ -2,11 +2,9 @@ set(WTF_LIBRARY_TYPE SHARED) + + find_library(COCOA_LIBRARY Cocoa) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) +-find_library(READLINE_LIBRARY Readline) + list(APPEND WTF_LIBRARIES + ${COREFOUNDATION_LIBRARY} + ${COCOA_LIBRARY} +- ${READLINE_LIBRARY} + libicucore.dylib + ) + diff --git a/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch new file mode 100644 index 00000000000000..b94a4b76cbabad --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/qtwebkit.patch @@ -0,0 +1,12 @@ +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} + diff --git a/pkgs/development/libraries/qt-5/5.14/srcs.nix b/pkgs/development/libraries/qt-5/5.14/srcs.nix new file mode 100644 index 00000000000000..6ac958442f49b5 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.14/srcs.nix @@ -0,0 +1,342 @@ +# DO NOT EDIT! This file is generated automatically. +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.14 +{ fetchurl, mirror }: + +{ + qt3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qt3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674"; + name = "qt3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtactiveqt = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtactiveqt-everywhere-src-5.14.2.tar.xz"; + sha256 = "b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9"; + name = "qtactiveqt-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtandroidextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtandroidextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76"; + name = "qtandroidextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtbase = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtbase-everywhere-src-5.14.2.tar.xz"; + sha256 = "48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a"; + name = "qtbase-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtcharts = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtcharts-everywhere-src-5.14.2.tar.xz"; + sha256 = "adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7"; + name = "qtcharts-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtconnectivity = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtconnectivity-everywhere-src-5.14.2.tar.xz"; + sha256 = "abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28"; + name = "qtconnectivity-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdatavis3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20"; + name = "qtdatavis3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdeclarative = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdeclarative-everywhere-src-5.14.2.tar.xz"; + sha256 = "a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650"; + name = "qtdeclarative-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtdoc = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtdoc-everywhere-src-5.14.2.tar.xz"; + sha256 = "5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b"; + name = "qtdoc-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtgamepad = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgamepad-everywhere-src-5.14.2.tar.xz"; + sha256 = "f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03"; + name = "qtgamepad-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtgraphicaleffects = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + sha256 = "487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f"; + name = "qtgraphicaleffects-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtimageformats = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtimageformats-everywhere-src-5.14.2.tar.xz"; + sha256 = "733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c"; + name = "qtimageformats-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtlocation = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlocation-everywhere-src-5.14.2.tar.xz"; + sha256 = "c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc"; + name = "qtlocation-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtlottie = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtlottie-everywhere-src-5.14.2.tar.xz"; + sha256 = "55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978"; + name = "qtlottie-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtmacextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmacextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5"; + name = "qtmacextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtmultimedia = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtmultimedia-everywhere-src-5.14.2.tar.xz"; + sha256 = "7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9"; + name = "qtmultimedia-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtnetworkauth = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + sha256 = "4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e"; + name = "qtnetworkauth-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtpurchasing = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtpurchasing-everywhere-src-5.14.2.tar.xz"; + sha256 = "69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851"; + name = "qtpurchasing-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquick3d = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquick3d-everywhere-src-5.14.2.tar.xz"; + sha256 = "0640696d501f2b0bf57f64e98f30bfa3e1cc19c11c0e05e43d4fdb0d20488b2e"; + name = "qtquick3d-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquickcontrols = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + sha256 = "d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461"; + name = "qtquickcontrols-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquickcontrols2 = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + sha256 = "faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560"; + name = "qtquickcontrols2-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtquicktimeline = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + sha256 = "83a45d0998cbc77f8094854a477ab1ac0838ae7fd822563d995df40149893a9e"; + name = "qtquicktimeline-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtremoteobjects = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + sha256 = "a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6"; + name = "qtremoteobjects-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtscript = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscript-everywhere-src-5.14.2.tar.xz"; + sha256 = "e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe"; + name = "qtscript-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtscxml = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtscxml-everywhere-src-5.14.2.tar.xz"; + sha256 = "030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790"; + name = "qtscxml-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtsensors = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsensors-everywhere-src-5.14.2.tar.xz"; + sha256 = "bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61"; + name = "qtsensors-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtserialbus = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialbus-everywhere-src-5.14.2.tar.xz"; + sha256 = "0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91"; + name = "qtserialbus-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtserialport = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtserialport-everywhere-src-5.14.2.tar.xz"; + sha256 = "a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21"; + name = "qtserialport-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtspeech = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtspeech-everywhere-src-5.14.2.tar.xz"; + sha256 = "5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da"; + name = "qtspeech-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtsvg = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtsvg-everywhere-src-5.14.2.tar.xz"; + sha256 = "c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1"; + name = "qtsvg-everywhere-src-5.14.2.tar.xz"; + }; + }; + qttools = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttools-everywhere-src-5.14.2.tar.xz"; + sha256 = "5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5"; + name = "qttools-everywhere-src-5.14.2.tar.xz"; + }; + }; + qttranslations = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qttranslations-everywhere-src-5.14.2.tar.xz"; + sha256 = "2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6"; + name = "qttranslations-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtvirtualkeyboard = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + sha256 = "364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7"; + name = "qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwayland = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwayland-everywhere-src-5.14.2.tar.xz"; + sha256 = "d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a"; + name = "qtwayland-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebchannel = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebchannel-everywhere-src-5.14.2.tar.xz"; + sha256 = "7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874"; + name = "qtwebchannel-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebengine = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz"; + sha256 = "e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947"; + name = "qtwebengine-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebglplugin = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + sha256 = "eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417"; + name = "qtwebglplugin-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebsockets = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebsockets-everywhere-src-5.14.2.tar.xz"; + sha256 = "f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84"; + name = "qtwebsockets-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwebview = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwebview-everywhere-src-5.14.2.tar.xz"; + sha256 = "c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b"; + name = "qtwebview-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtwinextras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtwinextras-everywhere-src-5.14.2.tar.xz"; + sha256 = "980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2"; + name = "qtwinextras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtx11extras = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtx11extras-everywhere-src-5.14.2.tar.xz"; + sha256 = "be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a"; + name = "qtx11extras-everywhere-src-5.14.2.tar.xz"; + }; + }; + qtxmlpatterns = { + version = "5.14.2"; + src = fetchurl { + url = "${mirror}/official_releases/qt/5.14/5.14.2/submodules/qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + sha256 = "219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7"; + name = "qtxmlpatterns-everywhere-src-5.14.2.tar.xz"; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a77fe01f3f9b51..69358e30cd7251 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14827,6 +14827,21 @@ in libsForQt512 = recurseIntoAttrs (lib.makeScope qt512.newScope mkLibsForQt5); + qt514 = recurseIntoAttrs (makeOverridable + (import ../development/libraries/qt-5/5.14) { + inherit newScope; + inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; + inherit bison; + inherit cups; + inherit dconf; + inherit harfbuzz; + inherit libGL; + inherit perl; + inherit gtk3; + inherit (gst_all_1) gstreamer gst-plugins-base; + inherit llvmPackages_5; + }); + qt515 = recurseIntoAttrs (makeOverridable (import ../development/libraries/qt-5/5.15) { inherit newScope; @@ -14842,6 +14857,8 @@ in inherit llvmPackages_5; }); + libsForQt514 = recurseIntoAttrs (lib.makeScope qt514.newScope mkLibsForQt5); + libsForQt515 = recurseIntoAttrs (lib.makeScope qt515.newScope mkLibsForQt5); # TODO bump to 5.14 on darwin once it's not broken; see #95199 From a1f4287e36daa8ff88c9b71e8999a27582392d07 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 11:36:20 -0500 Subject: [PATCH 07/59] Keep Qt 5.14 for Plasma and KDE Applications --- pkgs/top-level/all-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 69358e30cd7251..8fca0d773b31c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13030,7 +13030,7 @@ in let mkFrameworks = import ../development/libraries/kde-frameworks; attrs = { - inherit libsForQt5; + libsForQt5 = libsForQt514; inherit lib fetchurl; }; in @@ -21293,7 +21293,8 @@ in let mkApplications = import ../applications/kde; attrs = { - inherit lib libsForQt5 fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; inherit okteta; }; in @@ -25475,7 +25476,8 @@ in let mkPlasma5 = import ../desktops/plasma-5; attrs = { - inherit libsForQt5 lib fetchurl; + libsForQt5 = libsForQt514; + inherit lib fetchurl; gconf = gnome2.GConf; inherit gsettings-desktop-schemas; }; From cedb5ff8a3b7c124d3ed645e561c3ffe9fe41e55 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:37:05 -0500 Subject: [PATCH 08/59] synfigstudio: use libsForQt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fca0d773b31c4..c11d3f7a69f9e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22106,7 +22106,7 @@ in }; synfigstudio = callPackage ../applications/graphics/synfigstudio { - mlt-qt5 = libsForQt5.mlt; + mlt-qt5 = libsForQt514.mlt; }; typora = callPackage ../applications/editors/typora { }; From ef97866598b6dbf57730f36af20551e995f91ec7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:41:07 -0500 Subject: [PATCH 09/59] minizincide: use qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c11d3f7a69f9e2..eda5a23bbbf8d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11184,7 +11184,7 @@ in minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; - minizincide = qt5.callPackage ../development/tools/minizinc/ide.nix { }; + minizincide = qt514.callPackage ../development/tools/minizinc/ide.nix { }; mk = callPackage ../development/tools/build-managers/mk { }; From d6a57a8f4d079d69b9160569cbf55a87067d1e36 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 15:41:21 -0500 Subject: [PATCH 10/59] pcl: broken with qtbase >= 5.15 --- pkgs/development/libraries/pcl/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index d1c39b42a9d5b3..cb1bcdd1bf75fa 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pointclouds.org/"; + broken = stdenv.lib.versionAtLeast qtbase.version "5.15"; description = "Open project for 2D/3D image and point cloud processing"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; From b3d72930d81aefd7964c7a7ad17a7d775592436d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 16:22:24 -0500 Subject: [PATCH 11/59] qtbase: Preserve configuration options on Qt < 5.15 --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 9e7d6ae4c2359f..cc6e45e3ebde55 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -296,6 +296,7 @@ stdenv.mkDerivation { ''-${lib.optionalString (!buildExamples) "no"}make examples'' ''-${lib.optionalString (!buildTests) "no"}make tests'' ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-v" ++ ( if stdenv.isDarwin @@ -310,7 +311,9 @@ stdenv.mkDerivation { else [ "-${lib.optionalString (compareVersion "5.9.0" < 0) "no-"}rpath" - + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-xcb" + ++ [ "-xcb" "-qpa xcb" "-L" "${libX11.out}/lib" @@ -325,6 +328,9 @@ stdenv.mkDerivation { ''-${lib.optionalString (cups == null) "no-"}cups'' "-dbus-linked" "-glib" + ] + ++ lib.optional (compareVersion "5.15.0" < 0) "-system-libjpeg" + ++ [ "-system-libpng" ] ++ lib.optional withGtk3 "-gtk" From 91bee6f06ce227266e6bd271b6d9f6ece1153da4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Sep 2020 18:36:52 -0500 Subject: [PATCH 12/59] mlt: broken with Qt 5.15 --- pkgs/development/libraries/mlt/qt-5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index f0b45753df0162..6b41affb126faa 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } From 22167ae45fb27fac1e6aec7d1bf6ce82516fcb12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:06:15 -0500 Subject: [PATCH 13/59] Pin broken packages to Qt 5.14 # Conflicts: # pkgs/top-level/all-packages.nix --- pkgs/top-level/all-packages.nix | 384 ++++++++++++++++---------------- 1 file changed, 192 insertions(+), 192 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eda5a23bbbf8d1..76f0a6d59c802a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -228,7 +228,7 @@ in archiver = callPackage ../applications/misc/archiver { }; - digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { }; + digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { }; grsync = callPackage ../applications/misc/grsync { }; @@ -749,7 +749,7 @@ in arduino-mk = callPackage ../development/arduino/arduino-mk {}; - apitrace = libsForQt5.callPackage ../applications/graphics/apitrace {}; + apitrace = libsForQt514.callPackage ../applications/graphics/apitrace {}; arguments = callPackage ../development/libraries/arguments { }; @@ -837,7 +837,7 @@ in brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; boxes = callPackage ../tools/text/boxes { }; @@ -1336,7 +1336,7 @@ in bindfs = callPackage ../tools/filesystems/bindfs { }; - birdtray = libsForQt5.callPackage ../applications/misc/birdtray { }; + birdtray = libsForQt514.callPackage ../applications/misc/birdtray { }; bitbucket-cli = python2Packages.bitbucket-cli; @@ -1517,7 +1517,7 @@ in }; traefik = callPackage ../servers/traefik { }; - calamares = libsForQt5.callPackage ../tools/misc/calamares { + calamares = libsForQt514.callPackage ../tools/misc/calamares { python = python3; boost = pkgs.boost.override { python = python3; }; }; @@ -2188,7 +2188,7 @@ in medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt5.callPackage ../applications/misc/megasync { }; + megasync = libsForQt514.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2677,14 +2677,14 @@ in cksfv = callPackage ../tools/networking/cksfv { }; - clementine = libsForQt5.callPackage ../applications/audio/clementine { + clementine = libsForQt514.callPackage ../applications/audio/clementine { gst_plugins = with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-ugly gst-libav ]; }; clementineUnfree = clementine.unfree; - mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { }; + mellowplayer = libsForQt514.callPackage ../applications/audio/mellowplayer { }; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -3211,7 +3211,7 @@ in dropbear = callPackage ../tools/networking/dropbear { }; - dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { }; + dsview = libsForQt514.callPackage ../applications/science/electronics/dsview { }; dtach = callPackage ../tools/misc/dtach { }; @@ -3317,7 +3317,7 @@ in sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; - strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; + strawberry = libsForQt514.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { inherit (darwin.apple_sdk.frameworks) Security; @@ -4291,7 +4291,7 @@ in hal-flash = callPackage ../os-specific/linux/hal-flash { }; - hal-hardware-analyzer = libsForQt5.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; + hal-hardware-analyzer = libsForQt514.callPackage ../applications/science/electronics/hal-hardware-analyzer { }; half = callPackage ../development/libraries/half { }; @@ -4359,7 +4359,7 @@ in hecate = callPackage ../applications/editors/hecate { }; - heaptrack = libsForQt5.callPackage ../development/tools/profiling/heaptrack {}; + heaptrack = libsForQt514.callPackage ../development/tools/profiling/heaptrack {}; heimdall = libsForQt5.callPackage ../tools/misc/heimdall { }; @@ -4442,11 +4442,11 @@ in i2pd = callPackage ../tools/networking/i2pd { }; - i-score = libsForQt5.callPackage ../applications/audio/i-score { }; + i-score = libsForQt514.callPackage ../applications/audio/i-score { }; iasl = callPackage ../development/compilers/iasl { }; - iannix = libsForQt5.callPackage ../applications/audio/iannix { }; + iannix = libsForQt514.callPackage ../applications/audio/iannix { }; jamulus = libsForQt5.callPackage ../applications/audio/jamulus { }; @@ -4787,31 +4787,31 @@ in krakenx = callPackage ../tools/system/krakenx { }; - partition-manager = libsForQt5.callPackage ../tools/misc/partition-manager { }; + partition-manager = libsForQt514.callPackage ../tools/misc/partition-manager { }; kpcli = callPackage ../tools/security/kpcli { }; - krename = libsForQt5.callPackage ../applications/misc/krename { }; + krename = libsForQt514.callPackage ../applications/misc/krename { }; krunner-pass = libsForQt5.callPackage ../tools/security/krunner-pass { }; - kronometer = libsForQt5.callPackage ../tools/misc/kronometer { }; + kronometer = libsForQt514.callPackage ../tools/misc/kronometer { }; krop = callPackage ../applications/graphics/krop { }; - kdiff3 = libsForQt5.callPackage ../tools/text/kdiff3 { }; + kdiff3 = libsForQt514.callPackage ../tools/text/kdiff3 { }; kube-router = callPackage ../applications/networking/cluster/kube-router { }; kwalletcli = libsForQt5.callPackage ../tools/security/kwalletcli { }; - peruse = libsForQt5.callPackage ../tools/misc/peruse { }; + peruse = libsForQt514.callPackage ../tools/misc/peruse { }; - ksmoothdock = libsForQt5.callPackage ../applications/misc/ksmoothdock { }; + ksmoothdock = libsForQt514.callPackage ../applications/misc/ksmoothdock { }; - kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kst = libsForQt514.callPackage ../tools/graphics/kst { gsl = gsl_1; }; - kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kstars = libsForQt514.callPackage ../applications/science/astronomy/kstars { }; kytea = callPackage ../tools/text/kytea { }; @@ -5049,7 +5049,7 @@ in ninka = callPackage ../development/tools/misc/ninka { }; - nixnote2 = libsForQt5.callPackage ../applications/misc/nixnote2 { }; + nixnote2 = libsForQt514.callPackage ../applications/misc/nixnote2 { }; nodejs = hiPrio nodejs-12_x; @@ -5706,7 +5706,7 @@ in inherit (callPackage ../servers/nextcloud {}) nextcloud17 nextcloud18 nextcloud19; - nextcloud-client = libsForQt5.callPackage ../applications/networking/nextcloud-client { }; + nextcloud-client = libsForQt514.callPackage ../applications/networking/nextcloud-client { }; nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; @@ -5794,7 +5794,7 @@ in graphicalSupport = true; }; - nmapsi4 = libsForQt5.callPackage ../tools/security/nmap/qt.nix { }; + nmapsi4 = libsForQt514.callPackage ../tools/security/nmap/qt.nix { }; nnn = callPackage ../applications/misc/nnn { }; @@ -5896,7 +5896,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt514.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -6047,7 +6047,7 @@ in overmind = callPackage ../applications/misc/overmind { }; - owncloud-client = libsForQt5.callPackage ../applications/networking/owncloud-client { }; + owncloud-client = libsForQt514.callPackage ../applications/networking/owncloud-client { }; oxidized = callPackage ../tools/admin/oxidized { }; @@ -6460,7 +6460,7 @@ in openmodelica = callPackage ../applications/science/misc/openmodelica { }; - qarte = libsForQt5.callPackage ../applications/video/qarte { }; + qarte = libsForQt514.callPackage ../applications/video/qarte { }; qlcplus = libsForQt512.callPackage ../applications/misc/qlcplus { }; @@ -6486,7 +6486,7 @@ in qosmic = libsForQt5.callPackage ../applications/graphics/qosmic { }; - qownnotes = libsForQt5.callPackage ../applications/office/qownnotes { }; + qownnotes = libsForQt514.callPackage ../applications/office/qownnotes { }; qpdf = callPackage ../development/libraries/qpdf { }; @@ -6498,7 +6498,7 @@ in qr-filetransfer = callPackage ../tools/networking/qr-filetransfer { }; - qtikz = libsForQt5.callPackage ../applications/graphics/ktikz { }; + qtikz = libsForQt514.callPackage ../applications/graphics/ktikz { }; quickjs = callPackage ../development/interpreters/quickjs { }; @@ -6564,7 +6564,7 @@ in reredirect = callPackage ../tools/misc/reredirect { }; - retext = libsForQt5.callPackage ../applications/editors/retext { }; + retext = libsForQt514.callPackage ../applications/editors/retext { }; richgo = callPackage ../development/tools/richgo { }; @@ -6678,7 +6678,7 @@ in rockbox_utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -6700,7 +6700,7 @@ in rshijack = callPackage ../tools/networking/rshijack { }; - rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; + rsibreak = libsForQt514.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { pythonPackages = python3Packages; @@ -6916,7 +6916,7 @@ in sigal = callPackage ../applications/misc/sigal { }; - sigil = libsForQt5.callPackage ../applications/editors/sigil { }; + sigil = libsForQt514.callPackage ../applications/editors/sigil { }; signal-cli = callPackage ../applications/networking/instant-messengers/signal-cli { }; @@ -6965,7 +6965,7 @@ in sleuthkit = callPackage ../tools/system/sleuthkit {}; - sleepyhead = libsForQt5.callPackage ../applications/misc/sleepyhead {}; + sleepyhead = libsForQt514.callPackage ../applications/misc/sleepyhead {}; slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; @@ -7123,7 +7123,7 @@ in subberthehut = callPackage ../tools/misc/subberthehut { }; - subsurface = libsForQt5.callPackage ../applications/misc/subsurface { }; + subsurface = libsForQt514.callPackage ../applications/misc/subsurface { }; sudo = callPackage ../tools/security/sudo { }; @@ -7276,7 +7276,7 @@ in ted = callPackage ../tools/typesetting/ted { }; - teamviewer = libsForQt5.callPackage ../applications/networking/remote/teamviewer { }; + teamviewer = libsForQt514.callPackage ../applications/networking/remote/teamviewer { }; teleconsole = callPackage ../tools/misc/teleconsole { }; @@ -7310,7 +7310,7 @@ in textadept = callPackage ../applications/editors/textadept { }; - texworks = libsForQt5.callPackage ../applications/editors/texworks { }; + texworks = libsForQt514.callPackage ../applications/editors/texworks { }; thc-hydra = callPackage ../tools/security/thc-hydra { }; @@ -8017,7 +8017,7 @@ in wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; wml = callPackage ../development/web/wml { }; @@ -9215,7 +9215,7 @@ in graalvm8-ee graalvm11-ee; - openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt { }; + openshot-qt = libsForQt514.callPackage ../applications/video/openshot-qt { }; openspin = callPackage ../development/compilers/openspin { }; @@ -9450,7 +9450,7 @@ in neko = callPackage ../development/compilers/neko { }; - nextpnr = libsForQt5.callPackage ../development/compilers/nextpnr { + nextpnr = libsForQt514.callPackage ../development/compilers/nextpnr { inherit (darwin.apple_sdk.frameworks) OpenGL; }; @@ -10273,7 +10273,7 @@ in ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { }; ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { }; - supercollider = libsForQt5.callPackage ../development/interpreters/supercollider { + supercollider = libsForQt514.callPackage ../development/interpreters/supercollider { fftw = fftwSinglePrec; }; @@ -11088,7 +11088,7 @@ in kati = callPackage ../development/tools/build-managers/kati { }; - kcc = libsForQt5.callPackage ../applications/graphics/kcc { }; + kcc = libsForQt514.callPackage ../applications/graphics/kcc { }; kconfig-frontends = callPackage ../development/tools/misc/kconfig-frontends { gperf = gperf_3_0; @@ -11162,7 +11162,7 @@ in lttv = callPackage ../development/tools/misc/lttv { }; - massif-visualizer = libsForQt5.callPackage ../development/tools/analysis/massif-visualizer { }; + massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { }; maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; @@ -11287,7 +11287,7 @@ in phantomjs = callPackage ../development/tools/phantomjs { }; - phantomjs2 = libsForQt5.callPackage ../development/tools/phantomjs2 { }; + phantomjs2 = libsForQt514.callPackage ../development/tools/phantomjs2 { }; pmccabe = callPackage ../development/tools/misc/pmccabe { }; @@ -11342,7 +11342,7 @@ in pyrseas = callPackage ../development/tools/database/pyrseas { }; - qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { }; + qtcreator = libsForQt514.callPackage ../development/tools/qtcreator { }; qxmledit = libsForQt5.callPackage ../applications/editors/qxmledit {} ; @@ -11353,7 +11353,7 @@ in lua = lua5; } // (config.radare or {}))) radare2 r2-for-cutter; - radare2-cutter = libsForQt5.callPackage ../development/tools/analysis/radare2/cutter.nix { }; + radare2-cutter = libsForQt514.callPackage ../development/tools/analysis/radare2/cutter.nix { }; ragel = ragelStable; @@ -12806,7 +12806,7 @@ in hdt = callPackage ../misc/hdt {}; - herqq = libsForQt5.callPackage ../development/libraries/herqq { }; + herqq = libsForQt514.callPackage ../development/libraries/herqq { }; heyefi = haskellPackages.heyefi; @@ -14777,7 +14777,7 @@ in qoauth = callPackage ../development/libraries/qoauth { }; - qolibri = libsForQt5.callPackage ../applications/misc/qolibri { }; + qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { libpng = libpng12; @@ -15082,7 +15082,7 @@ in qrupdate = callPackage ../development/libraries/qrupdate { }; - qgnomeplatform = libsForQt5.callPackage ../development/libraries/qgnomeplatform { }; + qgnomeplatform = libsForQt514.callPackage ../development/libraries/qgnomeplatform { }; randomx = callPackage ../development/libraries/randomx { }; @@ -15654,7 +15654,7 @@ in CoreText IOSurface ImageIO OpenGL GLUT; }; - vtk_9 = libsForQt5.callPackage ../development/libraries/vtk/9.x.nix { + vtk_9 = libsForQt514.callPackage ../development/libraries/vtk/9.x.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration @@ -16571,7 +16571,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa; }; - qpaeq = qt5.callPackage ../servers/pulseaudio/qpaeq.nix { }; + qpaeq = libsForQt514.callPackage ../servers/pulseaudio/qpaeq.nix { }; pulseaudioFull = pulseaudio.override { x11Support = true; @@ -17322,7 +17322,7 @@ in fatrace = callPackage ../os-specific/linux/fatrace { }; - ffado = libsForQt5.callPackage ../os-specific/linux/ffado { + ffado = libsForQt514.callPackage ../os-specific/linux/ffado { inherit (pkgs.linuxPackages) kernel; }; libffado = ffado; @@ -18863,7 +18863,7 @@ in kawkab-mono-font = callPackage ../data/fonts/kawkab-mono {}; - kde2-decoration = libsForQt5.callPackage ../data/themes/kde2 { }; + kde2-decoration = libsForQt514.callPackage ../data/themes/kde2 { }; kochi-substitute = callPackage ../data/fonts/kochi-substitute {}; @@ -19170,7 +19170,7 @@ in qgo = libsForQt5.callPackage ../games/qgo { }; - qmc2 = libsForQt5.callPackage ../misc/emulators/qmc2 { }; + qmc2 = libsForQt514.callPackage ../misc/emulators/qmc2 { }; quattrocento = callPackage ../data/fonts/quattrocento {}; @@ -19360,7 +19360,7 @@ in zafiro-icons = callPackage ../data/icons/zafiro-icons { }; - zeal = libsForQt5.callPackage ../data/documentation/zeal { }; + zeal = libsForQt514.callPackage ../data/documentation/zeal { }; zilla-slab = callPackage ../data/fonts/zilla-slab { }; @@ -19428,7 +19428,7 @@ in msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { }; - amarok = libsForQt5.callPackage ../applications/audio/amarok { }; + amarok = libsForQt514.callPackage ../applications/audio/amarok { }; amarok-kf5 = amarok; # for compatibility amfora = callPackage ../applications/networking/browsers/amfora { }; @@ -19449,7 +19449,7 @@ in antfs-cli = callPackage ../applications/misc/antfs-cli {}; - antimony = libsForQt5.callPackage ../applications/graphics/antimony {}; + antimony = libsForQt514.callPackage ../applications/graphics/antimony {}; antiword = callPackage ../applications/office/antiword {}; @@ -19528,7 +19528,7 @@ in bambootracker = libsForQt5.callPackage ../applications/audio/bambootracker { }; - cadence = qt5.callPackage ../applications/audio/cadence { }; + cadence = libsForQt514.callPackage ../applications/audio/cadence { }; cheesecutter = callPackage ../applications/audio/cheesecutter { }; @@ -19606,7 +19606,7 @@ in bevelbar = callPackage ../applications/window-managers/bevelbar { }; - bibletime = libsForQt5.callPackage ../applications/misc/bibletime { }; + bibletime = libsForQt514.callPackage ../applications/misc/bibletime { }; bino3d = libsForQt5.callPackage ../applications/video/bino3d { glew = glew110; @@ -19718,13 +19718,13 @@ in calculix = callPackage ../applications/science/math/calculix {}; - calibre-py2 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; + calibre-py2 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python2Packages; }; - calibre-py3 = libsForQt5.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; + calibre-py3 = libsForQt514.callPackage ../applications/misc/calibre { pythonPackages = python3Packages; }; calibre = calibre-py3; - calligra = libsForQt5.callPackage ../applications/office/calligra { + calligra = libsForQt514.callPackage ../applications/office/calligra { inherit (kdeApplications) akonadi-calendar akonadi-contacts; openjpeg = openjpeg_1; poppler = poppler_0_61; @@ -19738,7 +19738,7 @@ in carddav-util = callPackage ../tools/networking/carddav-util { }; - carla = qt5.callPackage ../applications/audio/carla { }; + carla = libsForQt514.callPackage ../applications/audio/carla { }; castor = callPackage ../applications/networking/browsers/castor { }; @@ -19748,7 +19748,7 @@ in cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -19812,7 +19812,7 @@ in clightd = callPackage ../applications/misc/clight/clightd.nix { }; - clipgrab = qt5.callPackage ../applications/video/clipgrab { }; + clipgrab = libsForQt514.callPackage ../applications/video/clipgrab { }; clipmenu = callPackage ../applications/misc/clipmenu { }; @@ -19839,11 +19839,11 @@ in cntr = callPackage ../applications/virtualization/cntr { }; - communi = libsForQt5.callPackage ../applications/networking/irc/communi { }; + communi = libsForQt514.callPackage ../applications/networking/irc/communi { }; confclerk = callPackage ../applications/misc/confclerk { }; - copyq = libsForQt5.callPackage ../applications/misc/copyq { }; + copyq = libsForQt514.callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { inherit (gnome2) libgnomeui GConf; @@ -19860,7 +19860,7 @@ in pygments = python27Packages.pygments; }; - csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { + csound-qt = libsForQt514.callPackage ../applications/audio/csound/csound-qt { python = python27; }; @@ -19881,7 +19881,7 @@ in coyim = callPackage ../applications/networking/instant-messengers/coyim {}; - cq-editor = libsForQt5.callPackage ../applications/graphics/cq-editor { + cq-editor = libsForQt514.callPackage ../applications/graphics/cq-editor { python3Packages = python37Packages; }; @@ -19901,7 +19901,7 @@ in curseradio = callPackage ../applications/audio/curseradio { }; - cutecom = libsForQt5.callPackage ../tools/misc/cutecom { }; + cutecom = libsForQt514.callPackage ../tools/misc/cutecom { }; cvs = callPackage ../applications/version-management/cvs { }; @@ -19957,7 +19957,7 @@ in dfasma = libsForQt5.callPackage ../applications/audio/dfasma { }; - dfilemanager = libsForQt5.callPackage ../applications/misc/dfilemanager { }; + dfilemanager = libsForQt514.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { inherit (pkgs.gnome2) libart_lgpl libgnomeui; @@ -20028,8 +20028,8 @@ in drawio = callPackage ../applications/graphics/drawio {}; - drawpile = libsForQt5.callPackage ../applications/graphics/drawpile { }; - drawpile-server-headless = libsForQt5.callPackage ../applications/graphics/drawpile { + drawpile = libsForQt514.callPackage ../applications/graphics/drawpile { }; + drawpile-server-headless = libsForQt514.callPackage ../applications/graphics/drawpile { buildClient = false; buildServerGui = false; }; @@ -20093,13 +20093,13 @@ in ekho = callPackage ../applications/audio/ekho { }; - electron-cash = libsForQt5.callPackage ../applications/misc/electron-cash { }; + electron-cash = libsForQt514.callPackage ../applications/misc/electron-cash { }; - electrum = libsForQt5.callPackage ../applications/misc/electrum { }; + electrum = libsForQt514.callPackage ../applications/misc/electrum { }; electrum-dash = callPackage ../applications/misc/electrum/dash.nix { }; - electrum-ltc = libsForQt5.callPackage ../applications/misc/electrum/ltc.nix { }; + electrum-ltc = libsForQt514.callPackage ../applications/misc/electrum/ltc.nix { }; elementary-planner = callPackage ../applications/office/elementary-planner { }; @@ -20231,7 +20231,7 @@ in evilvte = callPackage ../applications/misc/evilvte (config.evilvte or {}); - evilpixie = libsForQt5.callPackage ../applications/graphics/evilpixie { }; + evilpixie = libsForQt514.callPackage ../applications/graphics/evilpixie { }; exercism = callPackage ../applications/misc/exercism { }; @@ -20341,7 +20341,7 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; + fritzing = libsForQt514.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -20364,7 +20364,7 @@ in geoipupdate = callPackage ../applications/misc/geoipupdate/default.nix { }; - ghostwriter = libsForQt5.callPackage ../applications/editors/ghostwriter { }; + ghostwriter = libsForQt514.callPackage ../applications/editors/ghostwriter { }; gitweb = callPackage ../applications/version-management/git-and-tools/gitweb { }; @@ -20399,7 +20399,7 @@ in gr-osmosdr = callPackage ../applications/radio/gnuradio/osmosdr.nix { }; - goldendict = libsForQt5.callPackage ../applications/misc/goldendict { + goldendict = libsForQt514.callPackage ../applications/misc/goldendict { inherit (darwin) libiconv; }; @@ -20436,7 +20436,7 @@ in gpx = callPackage ../applications/misc/gpx { }; - gqrx = qt5.callPackage ../applications/radio/gqrx { }; + gqrx = libsForQt514.callPackage ../applications/radio/gqrx { }; gpx-viewer = callPackage ../applications/misc/gpx-viewer { }; @@ -20563,7 +20563,7 @@ in redoflacs = callPackage ../applications/audio/redoflacs { }; - flameshot = libsForQt5.callPackage ../tools/misc/flameshot { }; + flameshot = libsForQt514.callPackage ../tools/misc/flameshot { }; flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer (config.flashplayer or {}); @@ -20587,7 +20587,7 @@ in fractal = callPackage ../applications/networking/instant-messengers/fractal { }; - freecad = qt5.callPackage ../applications/graphics/freecad { + freecad = libsForQt514.callPackage ../applications/graphics/freecad { mpi = openmpi; # pyside2 5.12 is broken under python 3.8 python3Packages = python37Packages; @@ -20613,7 +20613,7 @@ in freerdpUnstable = freerdp; - friture = libsForQt5.callPackage ../applications/audio/friture { }; + friture = libsForQt514.callPackage ../applications/audio/friture { }; fte = callPackage ../applications/editors/fte { }; @@ -20707,17 +20707,17 @@ in opencv = python37Packages.opencv3; }; - manuskript = libsForQt5.callPackage ../applications/editors/manuskript { }; + manuskript = libsForQt514.callPackage ../applications/editors/manuskript { }; manul = callPackage ../development/tools/manul { }; - mindforger = libsForQt5.callPackage ../applications/editors/mindforger { }; + mindforger = libsForQt514.callPackage ../applications/editors/mindforger { }; mi2ly = callPackage ../applications/audio/mi2ly {}; moe = callPackage ../applications/editors/moe { }; - multibootusb = qt5.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb {}; praat = callPackage ../applications/audio/praat { }; @@ -20821,11 +20821,11 @@ in gosmore = callPackage ../applications/misc/gosmore { }; - gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { + gpsbabel = libsForQt514.callPackage ../applications/misc/gpsbabel { inherit (darwin) IOKit; }; - gpsbabel-gui = libsForQt5.callPackage ../applications/misc/gpsbabel/gui.nix { }; + gpsbabel-gui = libsForQt514.callPackage ../applications/misc/gpsbabel/gui.nix { }; gpscorrelate = callPackage ../applications/misc/gpscorrelate { }; @@ -21172,7 +21172,7 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; - inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; + inkcut = libsForQt514.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { lcms = lcms2; @@ -21182,13 +21182,13 @@ in lcms = lcms2; }; - inspectrum = libsForQt5.callPackage ../applications/radio/inspectrum { }; + inspectrum = libsForQt514.callPackage ../applications/radio/inspectrum { }; ion3 = callPackage ../applications/window-managers/ion-3 { lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = libsForQt514.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -21279,7 +21279,7 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt5.callPackage ../applications/video/k9copy {}; + k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; kail = callPackage ../tools/networking/kail { }; @@ -21310,18 +21310,18 @@ in k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { }; - kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; + kdeconnect = libsForQt514.callPackage ../applications/misc/kdeconnect { }; inherit (kdeFrameworks) kdesu; - kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; + kdevelop-pg-qt = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; - kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix { + kdevelop-unwrapped = libsForQt514.callPackage ../applications/editors/kdevelop5/kdevelop.nix { llvmPackages = llvmPackages_10; }; - kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; - kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix { + kdev-php = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-php.nix { }; + kdev-python = libsForQt514.callPackage ../applications/editors/kdevelop5/kdev-python.nix { python = python3; }; @@ -21335,7 +21335,7 @@ in kermit = callPackage ../tools/misc/kermit { }; - kexi = libsForQt5.callPackage ../applications/office/kexi { }; + kexi = libsForQt514.callPackage ../applications/office/kexi { }; khronos = callPackage ../applications/office/khronos { }; @@ -21343,7 +21343,7 @@ in keyfinder-cli = libsForQt5.callPackage ../applications/audio/keyfinder-cli { }; - kgraphviewer = libsForQt5.callPackage ../applications/graphics/kgraphviewer { }; + kgraphviewer = libsForQt514.callPackage ../applications/graphics/kgraphviewer { }; khal = callPackage ../applications/misc/khal { }; @@ -21371,7 +21371,7 @@ in kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { }; - kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { + kmymoney = libsForQt514.callPackage ../applications/office/kmymoney { inherit (kdeApplications) kidentitymanagement; inherit (kdeFrameworks) kdewebkit; }; @@ -21380,23 +21380,23 @@ in kondo = callPackage ../applications/misc/kondo { }; - konversation = libsForQt5.callPackage ../applications/networking/irc/konversation { }; + konversation = libsForQt514.callPackage ../applications/networking/irc/konversation { }; - kotatogram-desktop = qt5.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; + kotatogram-desktop = libsForQt514.callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop { }; kpt = callPackage ../applications/networking/cluster/kpt { }; - krita = libsForQt5.callPackage ../applications/graphics/krita { + krita = libsForQt514.callPackage ../applications/graphics/krita { openjpeg = openjpeg_1; }; - krusader = libsForQt5.callPackage ../applications/misc/krusader { }; + krusader = libsForQt514.callPackage ../applications/misc/krusader { }; ksuperkey = callPackage ../tools/X11/ksuperkey { }; ktimetracker = libsForQt5.callPackage ../applications/office/ktimetracker { }; - ktorrent = libsForQt5.callPackage ../applications/networking/p2p/ktorrent { }; + ktorrent = libsForQt514.callPackage ../applications/networking/p2p/ktorrent { }; kubecfg = callPackage ../applications/networking/cluster/kubecfg { }; @@ -21430,7 +21430,7 @@ in python3Packages = python36Packages; }; - kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { }; + kvirc = libsForQt514.callPackage ../applications/networking/irc/kvirc { }; lame = callPackage ../development/libraries/lame { }; @@ -21464,11 +21464,11 @@ in legit = gitAndTools.legit; - leo-editor = libsForQt5.callPackage ../applications/editors/leo-editor { }; + leo-editor = libsForQt514.callPackage ../applications/editors/leo-editor { }; libowfat = callPackage ../development/libraries/libowfat { }; - librecad = libsForQt5.callPackage ../applications/misc/librecad { }; + librecad = libsForQt514.callPackage ../applications/misc/librecad { }; libreoffice = hiPrio libreoffice-still; libreoffice-unwrapped = libreoffice.libreoffice; @@ -21492,7 +21492,7 @@ in }; libreoffice-qt = lowPrio (callPackage ../applications/office/libreoffice/wrapper.nix { - libreoffice = libsForQt5.callPackage ../applications/office/libreoffice + libreoffice = libsForQt514.callPackage ../applications/office/libreoffice (libreoffice-args // { kdeIntegration = true; variant = "fresh"; @@ -21565,13 +21565,13 @@ in loxodo = callPackage ../applications/misc/loxodo { }; - lsd2dsl = libsForQt5.callPackage ../applications/misc/lsd2dsl { }; + lsd2dsl = libsForQt514.callPackage ../applications/misc/lsd2dsl { }; lrzsz = callPackage ../tools/misc/lrzsz { }; lsp-plugins = callPackage ../applications/audio/lsp-plugins { }; - luminanceHDR = libsForQt5.callPackage ../applications/graphics/luminance-hdr { }; + luminanceHDR = libsForQt514.callPackage ../applications/graphics/luminance-hdr { }; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; @@ -21654,7 +21654,7 @@ in mandelbulber = libsForQt5.callPackage ../applications/graphics/mandelbulber { }; - mapmap = libsForQt5.callPackage ../applications/video/mapmap { }; + mapmap = libsForQt514.callPackage ../applications/video/mapmap { }; marathonctl = callPackage ../tools/virtualization/marathonctl { } ; @@ -21700,7 +21700,7 @@ in meme = callPackage ../applications/graphics/meme { }; - mendeley = libsForQt5.callPackage ../applications/office/mendeley { + mendeley = libsForQt514.callPackage ../applications/office/mendeley { gconf = pkgs.gnome2.GConf; }; @@ -21715,7 +21715,7 @@ in mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; }); - merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { }; + merkaartor = libsForQt514.callPackage ../applications/misc/merkaartor { }; meshlab = libsForQt5.callPackage ../applications/graphics/meshlab { }; @@ -21744,7 +21744,7 @@ in minishift = callPackage ../applications/networking/cluster/minishift { }; - minitube = libsForQt5.callPackage ../applications/video/minitube { }; + minitube = libsForQt514.callPackage ../applications/video/minitube { }; mimic = callPackage ../applications/audio/mimic { }; @@ -21949,7 +21949,7 @@ in if stdenv.isDarwin then callPackage ../applications/audio/musescore/darwin.nix { } else - libsForQt5.callPackage ../applications/audio/musescore { }; + libsForQt514.callPackage ../applications/audio/musescore { }; mmh = callPackage ../applications/networking/mailreaders/mmh { }; mutt = callPackage ../applications/networking/mailreaders/mutt { }; @@ -22001,7 +22001,7 @@ in ostinato = callPackage ../applications/networking/ostinato { }; p4 = callPackage ../applications/version-management/p4 { }; - p4v = libsForQt5.callPackage ../applications/version-management/p4v { }; + p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; partio = callPackage ../development/libraries/partio {}; @@ -22050,7 +22050,7 @@ in i3GapsSupport = false; }; - polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + polyphone = libsForQt514.callPackage ../applications/audio/polyphone { }; portfolio = callPackage ../applications/office/portfolio { jre = openjdk11; @@ -22060,11 +22060,11 @@ in qbec = callPackage ../applications/networking/cluster/qbec { }; - rssguard = libsForQt5.callPackage ../applications/networking/feedreaders/rssguard { }; + rssguard = libsForQt514.callPackage ../applications/networking/feedreaders/rssguard { }; scudcloud = callPackage ../applications/networking/instant-messengers/scudcloud { }; - shotcut = libsForQt5.callPackage ../applications/video/shotcut { + shotcut = libsForQt514.callPackage ../applications/video/shotcut { libmlt = mlt; }; @@ -22085,7 +22085,7 @@ in smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; - smtube = libsForQt5.callPackage ../applications/video/smtube {}; + smtube = libsForQt514.callPackage ../applications/video/smtube {}; softmaker-office = callPackage ../applications/office/softmaker/softmaker_office.nix {}; @@ -22163,7 +22163,7 @@ in mypaint-brushes = callPackage ../development/libraries/mypaint-brushes { }; - mythtv = libsForQt5.callPackage ../applications/video/mythtv { }; + mythtv = libsForQt514.callPackage ../applications/video/mythtv { }; micro = callPackage ../applications/editors/micro { }; @@ -22206,7 +22206,7 @@ in nomacs = libsForQt5.callPackage ../applications/graphics/nomacs { }; - notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; + notepadqq = libsForQt514.callPackage ../applications/editors/notepadqq { }; notbit = callPackage ../applications/networking/mailreaders/notbit { }; @@ -22235,11 +22235,11 @@ in obs-linuxbrowser = callPackage ../applications/video/obs-studio/linuxbrowser.nix { }; - obs-studio = libsForQt5.callPackage ../applications/video/obs-studio { }; + obs-studio = libsForQt514.callPackage ../applications/video/obs-studio { }; obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; - obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; @@ -22281,7 +22281,7 @@ in openjump = callPackage ../applications/misc/openjump { }; - openorienteering-mapper = libsForQt5.callPackage ../applications/gis/openorienteering-mapper { }; + openorienteering-mapper = libsForQt514.callPackage ../applications/gis/openorienteering-mapper { }; openscad = libsForQt5.callPackage ../applications/graphics/openscad {}; @@ -22550,9 +22550,9 @@ in ps2client = callPackage ../applications/networking/ps2client { }; - psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { }; + psi = libsForQt514.callPackage ../applications/networking/instant-messengers/psi { }; - psi-plus = libsForQt5.callPackage ../applications/networking/instant-messengers/psi-plus { }; + psi-plus = libsForQt514.callPackage ../applications/networking/instant-messengers/psi-plus { }; psol = callPackage ../development/libraries/psol { }; @@ -22566,7 +22566,7 @@ in pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { }; - pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { }; + pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { }; puredata = callPackage ../applications/audio/puredata { }; puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; }; @@ -22599,7 +22599,7 @@ in qemu-utils = callPackage ../applications/virtualization/qemu/utils.nix {}; - qgis-unwrapped = libsForQt5.callPackage ../applications/gis/qgis/unwrapped.nix { + qgis-unwrapped = libsForQt514.callPackage ../applications/gis/qgis/unwrapped.nix { withGrass = false; }; @@ -22611,11 +22611,11 @@ in qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt {}; + qlandkartegt = libsForQt514.callPackage ../applications/misc/qlandkartegt {}; garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix {}; - qmapshack = libsForQt5.callPackage ../applications/misc/qmapshack { }; + qmapshack = libsForQt514.callPackage ../applications/misc/qmapshack { }; qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { boost = boost17x; @@ -22631,7 +22631,7 @@ in qmmp = libsForQt5.callPackage ../applications/audio/qmmp { }; - qnotero = libsForQt5.callPackage ../applications/office/qnotero { }; + qnotero = libsForQt514.callPackage ../applications/office/qnotero { }; qrcode = callPackage ../tools/graphics/qrcode {}; @@ -22644,7 +22644,7 @@ in qsstv = qt5.callPackage ../applications/radio/qsstv { }; - qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; + qsyncthingtray = libsForQt514.callPackage ../applications/misc/qsyncthingtray { }; qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { guvcview = guvcview.override { @@ -22692,9 +22692,9 @@ in quilter = callPackage ../applications/editors/quilter { }; - quiterss = libsForQt5.callPackage ../applications/networking/newsreaders/quiterss {}; + quiterss = libsForQt514.callPackage ../applications/networking/newsreaders/quiterss {}; - falkon = libsForQt5.callPackage ../applications/networking/browsers/falkon { }; + falkon = libsForQt514.callPackage ../applications/networking/browsers/falkon { }; quodlibet = callPackage ../applications/audio/quodlibet { keybinder3 = null; @@ -22725,7 +22725,7 @@ in quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; }; - qutebrowser = libsForQt5.callPackage ../applications/networking/browsers/qutebrowser { }; + qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { }; rabbitvcs = callPackage ../applications/version-management/rabbitvcs {}; @@ -22743,9 +22743,9 @@ in raiseorlaunch = callPackage ../applications/misc/raiseorlaunch {}; - rapcad = libsForQt5.callPackage ../applications/graphics/rapcad { boost = boost159; }; + rapcad = libsForQt514.callPackage ../applications/graphics/rapcad { boost = boost159; }; - rapid-photo-downloader = libsForQt5.callPackage ../applications/graphics/rapid-photo-downloader { }; + rapid-photo-downloader = libsForQt514.callPackage ../applications/graphics/rapid-photo-downloader { }; rapidsvn = callPackage ../applications/version-management/rapidsvn { }; @@ -22761,7 +22761,7 @@ in rclone = callPackage ../applications/networking/sync/rclone { }; - rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { }; + rclone-browser = libsForQt514.callPackage ../applications/networking/sync/rclone/browser.nix { }; rcs = callPackage ../applications/version-management/rcs { }; @@ -22781,7 +22781,7 @@ in remotebox = callPackage ../applications/virtualization/remotebox { }; - retroshare = libsForQt5.callPackage ../applications/networking/p2p/retroshare { }; + retroshare = libsForQt514.callPackage ../applications/networking/p2p/retroshare { }; retroshare06 = retroshare; rgp = libsForQt5.callPackage ../development/tools/rgp { }; @@ -22807,11 +22807,11 @@ in rootlesskit = callPackage ../tools/virtualization/rootlesskit {}; - rpcs3 = libsForQt5.callPackage ../misc/emulators/rpcs3 { }; + rpcs3 = libsForQt514.callPackage ../misc/emulators/rpcs3 { }; rsclock = callPackage ../applications/misc/rsclock { }; - rstudio = libsForQt5.callPackage ../applications/editors/rstudio { + rstudio = libsForQt514.callPackage ../applications/editors/rstudio { boost = boost166; llvmPackages = llvmPackages_7; }; @@ -22849,13 +22849,13 @@ in sakura = callPackage ../applications/misc/sakura { }; - sayonara = libsForQt5.callPackage ../applications/audio/sayonara { }; + sayonara = libsForQt514.callPackage ../applications/audio/sayonara { }; sbagen = callPackage ../applications/misc/sbagen { }; scantailor = callPackage ../applications/graphics/scantailor { }; - scantailor-advanced = qt5.callPackage ../applications/graphics/scantailor/advanced.nix { }; + scantailor-advanced = libsForQt514.callPackage ../applications/graphics/scantailor/advanced.nix { }; sc-im = callPackage ../applications/misc/sc-im { }; @@ -22865,9 +22865,9 @@ in inherit (gnome2) libart_lgpl; }; - scribusUnstable = libsForQt5.callPackage ../applications/office/scribus/unstable.nix { }; + scribusUnstable = libsForQt514.callPackage ../applications/office/scribus/unstable.nix { }; - seafile-client = libsForQt5.callPackage ../applications/networking/seafile-client { }; + seafile-client = libsForQt514.callPackage ../applications/networking/seafile-client { }; seeks = callPackage ../tools/networking/p2p/seeks { protobuf = protobuf3_1; @@ -22993,7 +22993,7 @@ in maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = libsForQt5.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = libsForQt514.callPackage ../applications/networking/maestral-qt { }; insync = callPackage ../applications/networking/insync { }; @@ -23030,11 +23030,11 @@ in curaengine = callPackage ../applications/misc/curaengine { inherit (python3.pkgs) libarcus; }; - cura = qt5.callPackage ../applications/misc/cura { }; + cura = libsForQt514.callPackage ../applications/misc/cura { }; curaPlugins = callPackage ../applications/misc/cura/plugins.nix { }; - curaLulzbot = qt5.callPackage ../applications/misc/cura/lulzbot/default.nix { }; + curaLulzbot = libsForQt514.callPackage ../applications/misc/cura/lulzbot/default.nix { }; curaByDagoma = callPackage ../applications/misc/curabydagoma { }; @@ -23052,7 +23052,7 @@ in sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; - skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; + skrooge = libsForQt514.callPackage ../applications/office/skrooge {}; smartgithg = callPackage ../applications/version-management/smartgithg { jre = openjdk11; @@ -23068,11 +23068,11 @@ in sipp = callPackage ../development/tools/misc/sipp { }; - skanlite = libsForQt5.callPackage ../applications/office/skanlite { }; + skanlite = libsForQt514.callPackage ../applications/office/skanlite { }; soci = callPackage ../development/libraries/soci { }; - sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { }; + sonic-lineup = libsForQt514.callPackage ../applications/audio/sonic-lineup { }; sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { }; @@ -23171,7 +23171,7 @@ in swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; - swift-im = libsForQt5.callPackage ../applications/networking/instant-messengers/swift-im { + swift-im = libsForQt514.callPackage ../applications/networking/instant-messengers/swift-im { inherit (gnome2) GConf; boost = boost168; }; @@ -23384,7 +23384,7 @@ in todoman = callPackage ../applications/office/todoman { }; - toggldesktop = libsForQt5.callPackage ../applications/misc/toggldesktop { }; + toggldesktop = libsForQt514.callPackage ../applications/misc/toggldesktop { }; topydo = callPackage ../applications/misc/topydo {}; @@ -23396,7 +23396,7 @@ in tortoisehg = callPackage ../applications/version-management/tortoisehg { }; - tony = libsForQt5.callPackage ../applications/audio/tony { }; + tony = libsForQt514.callPackage ../applications/audio/tony { }; toot = callPackage ../applications/misc/toot { }; @@ -23442,7 +23442,7 @@ in tribler = callPackage ../applications/networking/p2p/tribler { }; - trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { + trojita = libsForQt514.callPackage ../applications/networking/mailreaders/trojita { inherit (kdeApplications) akonadi-contacts; }; @@ -23502,7 +23502,7 @@ in utox = callPackage ../applications/networking/instant-messengers/utox { }; - valentina = libsForQt5.callPackage ../applications/misc/valentina { }; + valentina = libsForQt514.callPackage ../applications/misc/valentina { }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -23539,7 +23539,7 @@ in vimacs = callPackage ../applications/editors/vim/vimacs.nix { }; - qpdfview = libsForQt5.callPackage ../applications/misc/qpdfview {}; + qpdfview = libsForQt514.callPackage ../applications/misc/qpdfview {}; qtile = callPackage ../applications/window-managers/qtile { inherit (xorg) libxcb; @@ -23558,7 +23558,7 @@ in neovim = wrapNeovim neovim-unwrapped { }; - neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { }; + neovim-qt = libsForQt514.callPackage ../applications/editors/neovim/qt.nix { }; olifant = callPackage ../applications/misc/olifant { }; @@ -23586,7 +23586,7 @@ in system-libvirt = libvirt; }; - virt-manager-qt = libsForQt5.callPackage ../applications/virtualization/virt-manager/qt.nix { + virt-manager-qt = libsForQt514.callPackage ../applications/virtualization/virt-manager/qt.nix { qtermwidget = lxqt.qtermwidget; }; @@ -23596,7 +23596,7 @@ in virtual-ans = callPackage ../applications/audio/virtual-ans {}; - virtualbox = libsForQt5.callPackage ../applications/virtualization/virtualbox { + virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox { stdenv = stdenv_32bit; inherit (gnome2) libIDL; }; @@ -23733,9 +23733,9 @@ in wayvnc = callPackage ../applications/networking/remote/wayvnc { }; - webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; + webcamoid = libsForQt514.callPackage ../applications/video/webcamoid { }; - webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; + webmacs = libsForQt514.callPackage ../applications/networking/browsers/webmacs {}; webtorrent_desktop = callPackage ../applications/video/webtorrent_desktop {}; @@ -23813,7 +23813,7 @@ in worldengine-cli = python3Packages.worldengine; - wpsoffice = libsForQt5.callPackage ../applications/office/wpsoffice {}; + wpsoffice = libsForQt514.callPackage ../applications/office/wpsoffice {}; wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { }; @@ -24198,7 +24198,7 @@ in inherit (gnome2) scrollkeeper libglade; }; - xygrib = libsForQt5.callPackage ../applications/misc/xygrib/default.nix {}; + xygrib = libsForQt514.callPackage ../applications/misc/xygrib/default.nix {}; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -24238,7 +24238,7 @@ in zam-plugins = callPackage ../applications/audio/zam-plugins { }; - zanshin = libsForQt5.callPackage ../applications/office/zanshin { + zanshin = libsForQt514.callPackage ../applications/office/zanshin { inherit (kdeApplications) akonadi-calendar akonadi-notes akonadi-search kidentitymanagement kontactinterface kldap; inherit (kdeFrameworks) krunner kwallet kcalendarcore; boost = boost160; @@ -24281,7 +24281,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - zoom-us = libsForQt5.callPackage ../applications/networking/instant-messengers/zoom-us { }; + zoom-us = libsForQt514.callPackage ../applications/networking/instant-messengers/zoom-us { }; zotero = callPackage ../applications/office/zotero { }; @@ -24309,7 +24309,7 @@ in withGui = false; }; - bitcoin-unlimited = libsForQt5.callPackage ../applications/blockchains/bitcoin-unlimited.nix { + bitcoin-unlimited = libsForQt514.callPackage ../applications/blockchains/bitcoin-unlimited.nix { inherit (darwin.apple_sdk.frameworks) Foundation ApplicationServices AppKit; withGui = true; }; @@ -24318,10 +24318,10 @@ in withGui = false; }; - bitcoin-classic = libsForQt5.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; + bitcoin-classic = libsForQt514.callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = true; }; bitcoind-classic = callPackage ../applications/blockchains/bitcoin-classic.nix { boost = boost165; withGui = false; }; - bitcoin-gold = libsForQt5.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; + bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; btc1 = callPackage ../applications/blockchains/btc1.nix { @@ -24339,7 +24339,7 @@ in dero = callPackage ../applications/blockchains/dero.nix { boost = boost165; }; - digibyte = libsForQt5.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; + digibyte = libsForQt514.callPackage ../applications/blockchains/digibyte.nix { withGui = true; }; digibyted = callPackage ../applications/blockchains/digibyte.nix { withGui = false; }; dogecoin = callPackage ../applications/blockchains/dogecoin.nix { boost = boost165; withGui = true; }; @@ -24359,7 +24359,7 @@ in ledger-live-desktop = callPackage ../applications/blockchains/ledger-live-desktop { }; - litecoin = libsForQt5.callPackage ../applications/blockchains/litecoin.nix { + litecoin = libsForQt514.callPackage ../applications/blockchains/litecoin.nix { inherit (darwin.apple_sdk.frameworks) AppKit; }; litecoind = litecoin.override { withGui = false; }; @@ -24382,7 +24382,7 @@ in namecoin = callPackage ../applications/blockchains/namecoin.nix { withGui = true; }; namecoind = callPackage ../applications/blockchains/namecoin.nix { withGui = false; }; - pivx = libsForQt5.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; + pivx = libsForQt514.callPackage ../applications/blockchains/pivx.nix { withGui = true; }; pivxd = callPackage ../applications/blockchains/pivx.nix { withGui = false; }; ethabi = callPackage ../applications/blockchains/ethabi.nix { }; @@ -24393,7 +24393,7 @@ in tessera = callPackage ../applications/blockchains/tessera.nix { }; - vertcoin = libsForQt5.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; + vertcoin = libsForQt514.callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = true; }; vertcoind = callPackage ../applications/blockchains/vertcoin.nix { boost = boost165; withGui = false; }; wasabiwallet = callPackage ../applications/blockchains/wasabiwallet { }; @@ -24525,7 +24525,7 @@ in chessx = libsForQt5.callPackage ../games/chessx { }; - chiaki = libsForQt5.callPackage ../games/chiaki { }; + chiaki = libsForQt514.callPackage ../games/chiaki { }; chocolateDoom = callPackage ../games/chocolate-doom { }; @@ -24577,7 +24577,7 @@ in dhewm3 = callPackage ../games/dhewm3 {}; - digikam = libsForQt5.callPackage ../applications/graphics/digikam { + digikam = libsForQt514.callPackage ../applications/graphics/digikam { inherit (plasma5) oxygen; inherit (kdeApplications) akonadi-contacts; inherit (kdeFrameworks) kcalendarcore; @@ -24758,7 +24758,7 @@ in hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; - hedgewars = libsForQt5.callPackage ../games/hedgewars { + hedgewars = libsForQt514.callPackage ../games/hedgewars { inherit (haskellPackages) ghcWithPackages; }; @@ -24956,7 +24956,7 @@ in papermc = callPackage ../games/papermc { }; - pentobi = libsForQt5.callPackage ../games/pentobi { }; + pentobi = libsForQt514.callPackage ../games/pentobi { }; performous = callPackage ../games/performous { boost = boost166; @@ -25101,7 +25101,7 @@ in solarus = libsForQt5.callPackage ../games/solarus { }; - solarus-quest-editor = libsForQt5.callPackage ../development/tools/solarus-quest-editor { }; + solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; @@ -25944,7 +25944,7 @@ in xfitter = callPackage ../applications/science/physics/xfitter {}; - xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { }; + xflr5 = libsForQt514.callPackage ../applications/science/physics/xflr5 { }; ### SCIENCE/PROGRAMMING @@ -26163,7 +26163,7 @@ in adms = callPackage ../applications/science/electronics/adms { }; - appcsxcad = libsForQt5.callPackage ../applications/science/electronics/appcsxcad { }; + appcsxcad = libsForQt514.callPackage ../applications/science/electronics/appcsxcad { }; # Since version 8 Eagle requires an Autodesk account and a subscription # in contrast to single payment for the charged editions. @@ -26172,7 +26172,7 @@ in openssl = openssl_1_0_2; }; - eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { }; + eagle = libsForQt514.callPackage ../applications/science/electronics/eagle/eagle.nix { }; caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { }; @@ -26209,7 +26209,7 @@ in pcb = callPackage ../applications/science/electronics/pcb { }; - qcsxcad = libsForQt5.callPackage ../applications/science/electronics/qcsxcad { }; + qcsxcad = libsForQt514.callPackage ../applications/science/electronics/qcsxcad { }; qucs = callPackage ../applications/science/electronics/qucs { }; @@ -26438,7 +26438,7 @@ in ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; @@ -26478,7 +26478,7 @@ in cached-nix-shell = callPackage ../tools/nix/cached-nix-shell {}; - calaos_installer = libsForQt5.callPackage ../misc/calaos/installer {}; + calaos_installer = libsForQt514.callPackage ../misc/calaos/installer {}; ccemux = callPackage ../misc/emulators/ccemux { }; @@ -26752,7 +26752,7 @@ in mamba = callPackage ../applications/audio/mamba{ }; - mame = libsForQt5.callPackage ../misc/emulators/mame { + mame = libsForQt514.callPackage ../misc/emulators/mame { inherit (darwin.apple_sdk.frameworks) CoreAudioKit ForceFeedback; }; @@ -27264,7 +27264,7 @@ in prow = callPackage ../applications/networking/cluster/prow { }; - tellico = libsForQt5.callPackage ../applications/misc/tellico { }; + tellico = libsForQt514.callPackage ../applications/misc/tellico { }; termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; @@ -27313,7 +27313,7 @@ in ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; }; - vnote = libsForQt5.callPackage ../applications/office/vnote { }; + vnote = libsForQt514.callPackage ../applications/office/vnote { }; ssh-audit = callPackage ../tools/security/ssh-audit { }; @@ -27395,7 +27395,7 @@ in vttest = callPackage ../tools/misc/vttest { }; - wacomtablet = libsForQt5.callPackage ../tools/misc/wacomtablet { }; + wacomtablet = libsForQt514.callPackage ../tools/misc/wacomtablet { }; wasmer = callPackage ../development/interpreters/wasmer { }; From 6e8bef3067fff08739019c013048523f836e65c3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 08:44:44 -0500 Subject: [PATCH 14/59] appstream-qt: build library with all Qt versions --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76f0a6d59c802a..7b25ed63ee2eb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11744,8 +11744,6 @@ in appstream-glib = callPackage ../development/libraries/appstream-glib { }; - appstream-qt = libsForQt5.callPackage ../development/libraries/appstream/qt.nix { }; - apr = callPackage ../development/libraries/apr { }; aprutil = callPackage ../development/libraries/apr-util { @@ -14901,6 +14899,8 @@ in alkimia = callPackage ../development/libraries/alkimia { }; + appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; From b32b655ce92c7b110a05257d86e4efbaeec3e363 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:21:53 -0500 Subject: [PATCH 15/59] plasma-wayland-protocols: add ttuegel as maintainer --- pkgs/development/libraries/plasma-wayland-protocols/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix index a84c3518c4a8e3..2d3a5239d7b7cf 100644 --- a/pkgs/development/libraries/plasma-wayland-protocols/default.nix +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -20,5 +20,6 @@ mkDerivation rec { description = "Plasma Wayland Protocols"; license = lib.licenses.lgpl21Plus; platforms = qtbase.meta.platforms; + maintainers = [ lib.maintainers.ttuegel ]; }; } From f021cb4a83560dad8360592b5369059cc993d789 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 09:22:45 -0500 Subject: [PATCH 16/59] plasma-wayland-protocols: build with all Qt versions --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b25ed63ee2eb7..d75fb5b570b9be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14949,6 +14949,8 @@ in phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + plasma-wayland-protocols = callPackage ../development/libraries/plasma-wayland-protocols { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -22031,8 +22033,6 @@ in planner = callPackage ../applications/office/planner { }; - plasma-wayland-protocols = libsForQt5.callPackage ../development/libraries/plasma-wayland-protocols { }; - playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; From 521fe0290aeee2a20219d2ffd7808d6e7cf0ba0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:14:57 -0500 Subject: [PATCH 17/59] plasma5.thirdParty: move third-party addons here --- .../plasma-5/{ => 3rdparty}/addons/caffeine-plus.nix | 0 .../kwin/scripts/dynamic-workspaces.nix | 0 .../{ => 3rdparty}/kwin/scripts/krohnkite.nix | 0 .../plasma-5/{ => 3rdparty}/kwin/scripts/tiling.nix | 0 pkgs/desktops/plasma-5/default.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 12 +++++------- 6 files changed, 13 insertions(+), 7 deletions(-) rename pkgs/desktops/plasma-5/{ => 3rdparty}/addons/caffeine-plus.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/dynamic-workspaces.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/krohnkite.nix (100%) rename pkgs/desktops/plasma-5/{ => 3rdparty}/kwin/scripts/tiling.nix (100%) diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix similarity index 100% rename from pkgs/desktops/plasma-5/addons/caffeine-plus.nix rename to pkgs/desktops/plasma-5/3rdparty/addons/caffeine-plus.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/krohnkite.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/krohnkite.nix diff --git a/pkgs/desktops/plasma-5/kwin/scripts/tiling.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix similarity index 100% rename from pkgs/desktops/plasma-5/kwin/scripts/tiling.nix rename to pkgs/desktops/plasma-5/3rdparty/kwin/scripts/tiling.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 07b464258149a0..265c22b556556e 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -138,6 +138,14 @@ let systemsettings = callPackage ./systemsettings.nix {}; user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; + + thirdParty = let inherit (libsForQt5) callPackage; in { + plasma-applet-caffeine-plus = callPackage ./3rdparty/addons/caffeine-plus.nix { }; + kwin-dynamic-workspaces = callPackage ./3rdparty/kwin/scripts/dynamic-workspaces.nix { }; + kwin-tiling = callPackage ./3rdparty/kwin/scripts/tiling.nix { }; + krohnkite = callPackage ./3rdparty/kwin/scripts/krohnkite.nix { }; + }; + }; in lib.makeScope libsForQt5.newScope packages diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d75fb5b570b9be..cc6ec4d348a1f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25495,13 +25495,11 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; - plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; - - kwin-dynamic-workspaces = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/dynamic-workspaces.nix { }; - - kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; - - krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; + inherit (plasma5.thirdParty) + plasma-applet-caffeine-plus + kwin-dynamic-workspaces + kwin-tiling + krohnkite; ### SCIENCE From 4fd58aa4e18c06ead397ad45d68b76d0930c6cbb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:23:24 -0500 Subject: [PATCH 18/59] lxqt: pin to Qt 5.14 --- pkgs/desktops/lxqt/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 45714260381b46..9105cb0c9c37b0 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -53,14 +53,14 @@ let preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT - pkgs.libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel - pkgs.libsForQt5.libkscreen # provides plugins for screen management software + libsForQt5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + libsForQt5.libkscreen # provides plugins for screen management software pkgs.libfm pkgs.libfm-extra pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + libsForQt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc6ec4d348a1f6..ca4c69c80961e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25440,7 +25440,8 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { - inherit pkgs libsForQt5; + libsForQt5 = libsForQt514; + inherit pkgs; inherit (lib) makeScope; }); From 20bfb27eaf6b1ebc796dae9eb9a1017a2e0aa534 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:36:47 -0500 Subject: [PATCH 19/59] nixos/plasma5: Use Qt 5.14 --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 75bf55a26396dd..869adee5552ba5 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -7,7 +7,8 @@ let xcfg = config.services.xserver; cfg = xcfg.desktopManager.plasma5; - inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5; + inherit (pkgs) kdeApplications plasma5; + libsForQt5 = pkgs.libsForQt514; inherit (pkgs) writeText; pulseaudio = config.hardware.pulseaudio; From 282aadbd36c6f75cde7abf62562020f7d1c15341 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:50:29 -0500 Subject: [PATCH 20/59] Revert "python.pkgs.pyqt5: 5.14.2 -> 5.15.0" This reverts commit 3977fed49ee33e3c42bca884a4872fdd1857ead3. --- pkgs/development/python-modules/pyqt/5.x.nix | 4 ++-- pkgs/development/python-modules/sip/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2af28bef0c951a..ece9ad5b4a3fad 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -30,12 +30,12 @@ let in buildPythonPackage rec { pname = "PyQt5"; - version = "5.15.0"; + version = "5.14.2"; format = "other"; src = pythonPackages.fetchPypi { inherit pname version; - sha256 = "sha256-xvdUiP/VNlpliTvGTqgqaVfbEm+/4zZUvNQ64cMMUvk="; + sha256 = "1c4y4qi1l540gd125ikj0al00k5pg65kmqaixcfbzslrsrphq8xx"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 760c5bca9ee188..2bc8b70e4ca5cf 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = sip-module; - version = "4.19.23"; + version = "4.19.22"; format = "other"; disabled = isPyPy; src = fetchurl { url = "https://www.riverbankcomputing.com/static/Downloads/sip/${version}/sip-${version}.tar.gz"; - sha256 = "sha256-IsqbzsU4gRTkDUqv18zQxP4HIpe2KNDFzfovAQwLx+c="; + sha256 = "0idywc326l8v1m3maprg1aq2gph67mmnnsskvlwfx8n19s16idz1"; }; configurePhase = '' From 65b0805f8f38b3d2a6585f4217f026c011cd2cbf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 11:54:34 -0500 Subject: [PATCH 21/59] pyqt5: Use Qt 5.14 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e17ccce7f27f97..2ef6bdebe86294 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5187,7 +5187,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt514.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5200,7 +5200,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt514.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; From 575b3a053aacd5630b44cc73c4e5505baebfe6d5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 13:50:50 -0500 Subject: [PATCH 22/59] plasma5: mark broken with Qt >= 5.15 --- pkgs/desktops/plasma-5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 265c22b556556e..8ab4b60156c66a 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -36,6 +36,7 @@ let }; mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + qtbase = libsForQt5.callPackage ({ qtbase }: qtbase) {}; packages = self: with self; let @@ -82,6 +83,7 @@ let setupHook = args.setupHook or defaultSetupHook; meta = { + broken = lib.versionAtLeast qtbase.version "5.15"; license = with lib.licenses; [ lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12 ]; From da7588178814b26b505f61023969236504e16ab5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 6 Sep 2020 14:33:28 -0500 Subject: [PATCH 23/59] lxqt: fix qtsvg import --- pkgs/desktops/lxqt/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 9105cb0c9c37b0..90e466f7471eca 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,4 +1,4 @@ -{ pkgs, makeScope, libsForQt5 }: +{ pkgs, makeScope, libsForQt5, qt5 }: let packages = self: with self; { @@ -60,7 +60,7 @@ let pkgs.lxmenu-data pkgs.menu-cache pkgs.openbox # default window manager - libsForQt5.qtsvg # provides QT5 plugins for svg icons + qt5.qtsvg # provides QT5 plugins for svg icons ]; corePackages = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca4c69c80961e0..49b4dec866a0e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25440,6 +25440,7 @@ in lumina = recurseIntoAttrs (callPackage ../desktops/lumina { }); lxqt = recurseIntoAttrs (import ../desktops/lxqt { + qt5 = qt514; libsForQt5 = libsForQt514; inherit pkgs; inherit (lib) makeScope; From 3cbcc14eef897607c50be4a9918d88614ea9881e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 07:59:07 -0500 Subject: [PATCH 24/59] pythonPackages: synchronize Qt 5 version --- pkgs/top-level/python-packages.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ef6bdebe86294..4702a2ad0630a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14,6 +14,11 @@ with pkgs.lib; +let + qt5 = pkgs.qt514; + libsForQt5 = pkgs.libsForQt514; +in + let packages = ( self: @@ -3576,7 +3581,7 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + mayavi = libsForQt5.callPackage ../development/python-modules/mayavi { inherit buildPythonPackage isPy27 fetchPypi; inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; }; @@ -4162,7 +4167,7 @@ in { ovh = callPackage ../development/python-modules/ovh { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); + ovito = toPythonModule (libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); owslib = callPackage ../development/python-modules/owslib { }; @@ -4483,8 +4488,8 @@ in { pooch = callPackage ../development/python-modules/pooch { }; poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; + inherit (qt5) qtbase; + inherit (libsForQt5) poppler; inherit (pkgs) pkgconfig; }; @@ -5187,7 +5192,7 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - pyqt5 = pkgs.libsForQt514.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; @@ -5200,7 +5205,7 @@ in { pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt514.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -5901,7 +5906,7 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; From eb174d1f4b1f0e66cdc2ae9231213e8dbfc8274c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:21:25 -0500 Subject: [PATCH 25/59] solarus: synchronize Qt version with solarus-quest-editor --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49b4dec866a0e5..24750fba0271bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25099,8 +25099,8 @@ in lua = lua5_1; }; - solarus = libsForQt5.callPackage ../games/solarus { }; - + # solarus and solarus-quest-editor must use the same version of Qt. + solarus = libsForQt514.callPackage ../games/solarus { }; solarus-quest-editor = libsForQt514.callPackage ../development/tools/solarus-quest-editor { }; # You still can override by passing more arguments. From 5d01b6cb1789128a1125f74f2b29cb47a10f3ddb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 08:31:31 -0500 Subject: [PATCH 26/59] vlc: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24750fba0271bc..99966a87145f43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23653,7 +23653,7 @@ in vkeybd = callPackage ../applications/audio/vkeybd {}; - vlc = libsForQt5.vlc; + vlc = libsForQt514.vlc; vlc_qt5 = vlc; From 210bfccb538e99529e20d9bd8afd0e9a6496a5cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:10:27 -0500 Subject: [PATCH 27/59] qca2-qt5: remove in favor of libsForQt5.qca-qt5 --- .../networking/instant-messengers/psi-plus/default.nix | 4 ++-- .../networking/instant-messengers/psi/default.nix | 4 ++-- pkgs/development/libraries/qoauth/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 430a7cc4ca778a..cf7c1008a08040 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libsecret, libXScrnSaver, hunspell +, libidn, qca-qt5, libsecret, libXScrnSaver, hunspell , libgcrypt, libotr, html-tidy, libgpgerror, libsignal-protocol-c }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libsecret libXScrnSaver hunspell + libidn qca-qt5 libsecret libXScrnSaver hunspell libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix index 19438c4d037b6d..c1984a218c8ae6 100644 --- a/pkgs/applications/networking/instant-messengers/psi/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, wrapQtAppsHook , qtbase, qtmultimedia, qtx11extras, qttools, qtwebengine -, libidn, qca2-qt5, libXScrnSaver, hunspell +, libidn, qca-qt5, libXScrnSaver, hunspell }: stdenv.mkDerivation rec { pname = "psi"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake wrapQtAppsHook ]; buildInputs = [ qtbase qtmultimedia qtx11extras qttools qtwebengine - libidn qca2-qt5 libXScrnSaver hunspell + libidn qca-qt5 libXScrnSaver hunspell ]; enableParallelBuilding = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 85682e2c2a296f..386019a0067253 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca2-qt5 }: +{ stdenv, fetchurl, qt5, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,10 +15,10 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca2-qt5 ]; + buildInputs = [ qt5.qtbase qca-qt5 ]; nativeBuildInputs = [ qt5.qmake ]; - NIX_CFLAGS_COMPILE = "-I${qca2-qt5}/include/Qca-qt5/QtCrypto"; + NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99966a87145f43..ac0cdd6d175e19 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14767,7 +14767,6 @@ in qbs = libsForQt5.callPackage ../development/tools/build-managers/qbs { }; qca2 = callPackage ../development/libraries/qca2 { qt = qt4; }; - qca2-qt5 = qca2.override { qt = qt5.qtbase; }; qimageblitz = callPackage ../development/libraries/qimageblitz {}; From 91e0c687ac5503b2dfd665867359b3f6fc86ab3d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:12 -0500 Subject: [PATCH 28/59] qoauth: move to libsForQt5 --- pkgs/development/libraries/qoauth/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qoauth/default.nix b/pkgs/development/libraries/qoauth/default.nix index 386019a0067253..41e4b80d9c3aa2 100644 --- a/pkgs/development/libraries/qoauth/default.nix +++ b/pkgs/development/libraries/qoauth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt5, qca-qt5 }: +{ stdenv, fetchurl, qtbase, qmake, qca-qt5 }: stdenv.mkDerivation { name = "qoauth-2.0.0"; @@ -15,15 +15,15 @@ stdenv.mkDerivation { -e '/features.path =/ s|$$\[QMAKE_MKSPECS\]|$$NIX_OUTPUT_DEV/mkspecs|' ''; - buildInputs = [ qt5.qtbase qca-qt5 ]; - nativeBuildInputs = [ qt5.qmake ]; + buildInputs = [ qtbase qca-qt5 ]; + nativeBuildInputs = [ qmake ]; NIX_CFLAGS_COMPILE = "-I${qca-qt5}/include/Qca-qt5/QtCrypto"; NIX_LDFLAGS = "-lqca-qt5"; meta = with stdenv.lib; { description = "Qt library for OAuth authentication"; - inherit (qt5.qtbase.meta) platforms; + inherit (qtbase.meta) platforms; license = licenses.lgpl21; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac0cdd6d175e19..4e549f652dde35 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14772,8 +14772,6 @@ in qjson = callPackage ../development/libraries/qjson { }; - qoauth = callPackage ../development/libraries/qoauth { }; - qolibri = libsForQt514.callPackage ../applications/misc/qolibri { }; qt3 = callPackage ../development/libraries/qt-3 { @@ -14963,7 +14961,10 @@ in qmltermwidget = callPackage ../development/libraries/qmltermwidget { inherit (darwin.apple_sdk.libs) utmp; }; - qmlbox2d = libsForQt5.callPackage ../development/libraries/qmlbox2d { }; + + qmlbox2d = callPackage ../development/libraries/qmlbox2d { }; + + qoauth = callPackage ../development/libraries/qoauth { }; qscintilla = callPackage ../development/libraries/qscintilla { withQt5 = true; From 4b00ed2c22dc0c99ed4404b238d638f321cca93e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:36 -0500 Subject: [PATCH 29/59] qtpbfimageplugin: move to libsForQt5 --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e549f652dde35..8b995d25ccebc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14978,6 +14978,8 @@ in withQt5 = true; }; + qtpbfimageplugin = callPackage ../development/libraries/qtpbfimageplugin { }; + qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; @@ -14999,8 +15001,6 @@ in qtkeychain = callPackage ../development/libraries/qtkeychain { }; - qtpbfimageplugin = libsForQt5.callPackage ../development/libraries/qtpbfimageplugin { }; - qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; From b8b359c3c9130ca49ec0d7a6c6907523a640862f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:13:54 -0500 Subject: [PATCH 30/59] qtstyleplugin-kvantum: libsForQt5 packages may not be pinned --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8b995d25ccebc2..18a47d2c267a9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14982,7 +14982,7 @@ in qtstyleplugins = callPackage ../development/libraries/qtstyleplugins { }; - qtstyleplugin-kvantum = libsForQt5.callPackage ../development/libraries/qtstyleplugin-kvantum { }; + qtstyleplugin-kvantum = callPackage ../development/libraries/qtstyleplugin-kvantum { }; quazip = callPackage ../development/libraries/quazip { }; From 817fd0f17bb4eab19ab51e88bf6859a10f10382f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:14:08 -0500 Subject: [PATCH 31/59] colmap: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18a47d2c267a9b..bf21f2192cb2fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8432,7 +8432,7 @@ in colm = callPackage ../development/compilers/colm { }; - colmap = libsForQt5.callPackage ../applications/science/misc/colmap { }; + colmap = libsForQt514.callPackage ../applications/science/misc/colmap { }; colmapWithCuda = colmap.override { cudaSupport = true; }; chickenPackages_4 = callPackage ../development/compilers/chicken/4 { }; From 9cfd788879a096e260e3197b49aff98f2fbfbea2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:27:14 -0500 Subject: [PATCH 32/59] dupeguru: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf21f2192cb2fa..0f8e7945b7c7a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -276,7 +276,7 @@ in dispad = callPackage ../tools/X11/dispad { }; - dupeguru = callPackage ../applications/misc/dupeguru { }; + dupeguru = callPackage ../applications/misc/dupeguru { qt5 = qt514; }; dump1090 = callPackage ../applications/radio/dump1090 { }; From ad39c93e7f20a179dce5abc7ad0b01794bf905a1 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:28:06 -0500 Subject: [PATCH 33/59] qtcurve: pin to Qt 5.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f8e7945b7c7a3..8a8c4ebe9d6008 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19107,7 +19107,7 @@ in qogir-theme = callPackage ../data/themes/qogir { }; - qtcurve = libsForQt5.callPackage ../data/themes/qtcurve {}; + qtcurve = libsForQt514.callPackage ../data/themes/qtcurve {}; redhat-official-fonts = callPackage ../data/fonts/redhat-official { }; From c5059b88b58165eeff10ff9e6b0312540ae41406 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:31:25 -0500 Subject: [PATCH 34/59] gmic-qt: pin to qt514, synchronize with krita --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a8c4ebe9d6008..e3e5e84f72fa29 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2033,7 +2033,7 @@ in gmic = callPackage ../tools/graphics/gmic { }; - gmic-qt = libsForQt5.callPackage ../tools/graphics/gmic-qt { }; + gmic-qt = libsForQt514.callPackage ../tools/graphics/gmic-qt { }; gmic-qt-krita = gmic-qt.override { variant = "krita"; From a811e37d1c7bc6e0b68e7bf391fadd371db22850 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:35:11 -0500 Subject: [PATCH 35/59] roboschool: pin to qt514 --- pkgs/development/python-modules/roboschool/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 53b909844ac9c5..9387f3775beba4 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -4,7 +4,7 @@ , python , fetchFromGitHub , fetchpatch -, qt5 +, qtbase , boost , assimp , gym @@ -33,14 +33,14 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig - qt5.qtbase # needs the `moc` tool + qtbase # needs the `moc` tool which ]; buildInputs = [ bullet-roboschool assimp - qt5.qtbase + qtbase boost ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4702a2ad0630a2..d7c614b9f707de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6086,8 +6086,9 @@ in { robomachine = callPackage ../development/python-modules/robomachine { }; roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; - }; # use normal pkgconfig, not the python package + inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package + inherit (qt5) qtbase; + }; robot-detection = callPackage ../development/python-modules/robot-detection { }; From 0368d93a9e978b90ba844d83b292178e3a8c7574 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:37:48 -0500 Subject: [PATCH 36/59] qtikz: proper Qt dependencies --- pkgs/applications/graphics/ktikz/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/ktikz/default.nix b/pkgs/applications/graphics/ktikz/default.nix index 4ddc2074f2f46f..f817a33216061d 100644 --- a/pkgs/applications/graphics/ktikz/default.nix +++ b/pkgs/applications/graphics/ktikz/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , pkgconfig, wrapQtAppsHook -, poppler, qt5, gnuplot +, poppler, gnuplot +, qmake, qtbase, qttools }: # This package only builds ktikz without KDE integration because KDE4 is @@ -36,10 +37,10 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkgconfig qt5.qttools qt5.qmake wrapQtAppsHook ]; - QT_PLUGIN_PATH = "${qt5.qtbase}/${qt5.qtbase.qtPluginPrefix}"; + nativeBuildInputs = [ pkgconfig qttools qmake wrapQtAppsHook ]; + QT_PLUGIN_PATH = "${qtbase}/${qtbase.qtPluginPrefix}"; - buildInputs = [ qt5.qtbase poppler ]; + buildInputs = [ qtbase poppler ]; enableParallelBuilding = true; qmakeFlags = [ From e865c6ffccb80452f6353bb4bd0695c3199374cb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:53:37 -0500 Subject: [PATCH 37/59] pivy: pin to qt514 --- pkgs/development/python-modules/pivy/default.nix | 14 +++++++------- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index 36427f99585963..de75a7d390c3d8 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }: buildPythonPackage rec { pname = "pivy"; @@ -12,20 +12,20 @@ buildPythonPackage rec { }; nativeBuildInputs = with pkgs; [ - swig qt5.qmake cmake + swig qmake cmake ]; buildInputs = with pkgs; with xorg; [ - coin3d soqt qt5.qtbase + coin3d soqt qtbase libGLU libGL libXi libXext libSM libICE libX11 ]; NIX_CFLAGS_COMPILE = toString [ - "-I${pkgs.qt5.qtbase.dev}/include/QtCore" - "-I${pkgs.qt5.qtbase.dev}/include/QtGui" - "-I${pkgs.qt5.qtbase.dev}/include/QtOpenGL" - "-I${pkgs.qt5.qtbase.dev}/include/QtWidgets" + "-I${qtbase.dev}/include/QtCore" + "-I${qtbase.dev}/include/QtGui" + "-I${qtbase.dev}/include/QtOpenGL" + "-I${qtbase.dev}/include/QtWidgets" ]; dontUseQmakeConfigure = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d7c614b9f707de..67d96f10d74590 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4417,7 +4417,9 @@ in { pipx = callPackage ../development/python-modules/pipx { }; - pivy = callPackage ../development/python-modules/pivy { }; + pivy = callPackage ../development/python-modules/pivy { + inherit (qt5) qtbase qmake; + }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; From 858ccc567c3f3a5efddd875797e47909b4b821ce Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:54:55 -0500 Subject: [PATCH 38/59] soqt: add to libsForQt5 --- pkgs/development/libraries/soqt/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/soqt/default.nix b/pkgs/development/libraries/soqt/default.nix index ff7c670ca0dc6b..7a4e6c45cf2e3e 100644 --- a/pkgs/development/libraries/soqt/default.nix +++ b/pkgs/development/libraries/soqt/default.nix @@ -1,4 +1,4 @@ -{ fetchhg, stdenv, coin3d, qt5, cmake, pkgconfig }: +{ fetchhg, stdenv, coin3d, qtbase, cmake, pkgconfig }: stdenv.mkDerivation { pname = "soqt"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { fetchSubrepos = true; }; - buildInputs = [ coin3d qt5.qtbase ]; + buildInputs = [ coin3d qtbase ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3e5e84f72fa29..656daadc04b254 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14988,6 +14988,8 @@ in qwt = callPackage ../development/libraries/qwt/6.nix { }; + soqt = callPackage ../development/libraries/soqt { }; + telepathy = callPackage ../development/libraries/telepathy/qt { }; vlc = callPackage ../applications/video/vlc {}; @@ -15299,8 +15301,6 @@ in soprano = callPackage ../development/libraries/soprano { }; - soqt = callPackage ../development/libraries/soqt { }; - sord = callPackage ../development/libraries/sord {}; soundtouch = callPackage ../development/libraries/soundtouch {}; From 8c3cef55c5b63871179ae5439d78e58665cff2be Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:55:46 -0500 Subject: [PATCH 39/59] pivy: import soqt properly --- pkgs/development/python-modules/pivy/default.nix | 2 +- pkgs/top-level/python-packages.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pivy/default.nix b/pkgs/development/python-modules/pivy/default.nix index de75a7d390c3d8..8f1b7de92b9ccf 100644 --- a/pkgs/development/python-modules/pivy/default.nix +++ b/pkgs/development/python-modules/pivy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake }: +{ stdenv, buildPythonPackage, fetchFromGitHub, pkgs, qtbase, qmake, soqt }: buildPythonPackage rec { pname = "pivy"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67d96f10d74590..b10662bb15bcf1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4419,6 +4419,7 @@ in { pivy = callPackage ../development/python-modules/pivy { inherit (qt5) qtbase qmake; + inherit (libsForQt5) soqt; }; pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; From 7c07beb2a9388e78343ecb37caa739b0c9bbc4d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 10:58:27 -0500 Subject: [PATCH 40/59] plover: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 656daadc04b254..c4f9b25fd6afc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22504,7 +22504,7 @@ in plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { }; - plover = recurseIntoAttrs (libsForQt5.callPackage ../applications/misc/plover { }); + plover = recurseIntoAttrs (libsForQt514.callPackage ../applications/misc/plover { }); plugin-torture = callPackage ../applications/audio/plugin-torture { }; From c67159fd7d553f734ff5a81ce1f3a1ad490ef56b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:07:31 -0500 Subject: [PATCH 41/59] obs-ndi: pin to qt514 --- pkgs/applications/video/obs-studio/obs-ndi.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/obs-ndi.nix b/pkgs/applications/video/obs-studio/obs-ndi.nix index 79f38fa8fe406d..f22ddd39ee4bc5 100644 --- a/pkgs/applications/video/obs-studio/obs-ndi.nix +++ b/pkgs/applications/video/obs-studio/obs-ndi.nix @@ -5,14 +5,14 @@ # mkdir -p ~/.config/obs-studio/plugins/bin # ln -s ~/.nix-profile/lib/obs-plugins/obs-ndi.so ~/.config/obs-studio/plugins/bin/ -{ stdenv, fetchFromGitHub, obs-studio, cmake, qt5, ndi }: +{ stdenv, fetchFromGitHub, obs-studio, cmake, qtbase, ndi }: stdenv.mkDerivation rec { pname = "obs-ndi"; version = "4.7.1"; nativeBuildInputs = [ cmake ]; - buildInputs = [ obs-studio qt5.qtbase ndi ]; + buildInputs = [ obs-studio qtbase ndi ]; src = fetchFromGitHub { owner = "Palakis"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c4f9b25fd6afc3..a847b65ca45874 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22241,7 +22241,7 @@ in obs-v4l2sink = libsForQt514.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; - obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; + obs-ndi = libsForQt514.callPackage ../applications/video/obs-studio/obs-ndi.nix { }; obsidian = callPackage ../applications/misc/obsidian { }; From dde9da6f8902351701a9c28a3a6ccbe5fb044052 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:11:41 -0500 Subject: [PATCH 42/59] mumble: pin to qt514 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a847b65ca45874..fd18179970d47b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21936,6 +21936,7 @@ in jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or stdenv.isLinux; + qt5 = qt514; }).mumble; mumble_overlay = callPackage ../applications/networking/mumble/overlay.nix { From c0c73c1f2105902c7fcb1a64d74cc4a785a2a70d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:14:09 -0500 Subject: [PATCH 43/59] airwave: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd18179970d47b..c32886d646ce08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19412,7 +19412,7 @@ in ahoviewer = callPackage ../applications/graphics/ahoviewer { }; - airwave = callPackage ../applications/audio/airwave { }; + airwave = callPackage ../applications/audio/airwave { qt5 = qt514; }; akira-unstable = callPackage ../applications/graphics/akira { }; From d1e022773d55a163a77af72e1af4a6f59452f9ed Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:20:28 -0500 Subject: [PATCH 44/59] dxflib: move to libsForQt5 --- pkgs/development/libraries/dxflib/default.nix | 5 ++--- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/dxflib/default.nix b/pkgs/development/libraries/dxflib/default.nix index e1cb8d2d9e2605..1b63d8805fd9f6 100644 --- a/pkgs/development/libraries/dxflib/default.nix +++ b/pkgs/development/libraries/dxflib/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchurl -, qt5 +, qmake }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09yjgzh8677pzkkr7a59pql5d11451c22pxksk2my30mapxsri96"; }; nativeBuildInputs = [ - qt5.qmake + qmake ]; preConfigure = '' sed -i 's/CONFIG += staticlib/CONFIG += shared/' dxflib.pro @@ -42,4 +42,3 @@ stdenv.mkDerivation rec { description = ''DXF file format library''; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c32886d646ce08..1a4c0af0795cb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12138,8 +12138,6 @@ in duckdb = callPackage ../development/libraries/duckdb {}; - dxflib = callPackage ../development/libraries/dxflib {}; - easyloggingpp = callPackage ../development/libraries/easyloggingpp {}; eccodes = callPackage ../development/libraries/eccodes { @@ -14898,6 +14896,8 @@ in appstream-qt = callPackage ../development/libraries/appstream/qt.nix { }; + dxflib = callPackage ../development/libraries/dxflib {}; + fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { }; qgpgme = callPackage ../development/libraries/gpgme { }; From 77f840f14b7258fc52d06824d793f3aad9d2c288 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:22:07 -0500 Subject: [PATCH 45/59] ostinato: use wireshark with qt514 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a4c0af0795cb0..93a55c9af7bacc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22001,7 +22001,9 @@ in osm2pgsql = callPackage ../tools/misc/osm2pgsql { }; - ostinato = callPackage ../applications/networking/ostinato { }; + ostinato = callPackage ../applications/networking/ostinato { + wireshark = wireshark.override { qt5 = qt514; }; + }; p4 = callPackage ../applications/version-management/p4 { }; p4v = libsForQt514.callPackage ../applications/version-management/p4v { }; From 896c71ec6abe179b5a2926f0bcf8e80e60b61f15 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:22:55 -0500 Subject: [PATCH 46/59] sky: pin to qt514 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93a55c9af7bacc..9b84d44ad086a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22084,7 +22084,9 @@ in }; }; - sky = callPackage ../applications/networking/instant-messengers/sky {}; + sky = callPackage ../applications/networking/instant-messengers/sky { + qt5 = qt514; + }; smplayer = libsForQt5.callPackage ../applications/video/smplayer { }; From d784ee398f70ba078a45ee7b201db27b8d74b89f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:23:38 -0500 Subject: [PATCH 47/59] freeciv: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b84d44ad086a5..13668e82a633d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24669,7 +24669,7 @@ in freecell-solver = callPackage ../games/freecell-solver { }; - freeciv = callPackage ../games/freeciv { }; + freeciv = callPackage ../games/freeciv { qt5 = qt514; }; freeciv_gtk = freeciv.override { gtkClient = true; From dafc1cea57a727fe41c5fbd28b9e29ea14306dcb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:30:08 -0500 Subject: [PATCH 48/59] saga: depends on libsForQt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13668e82a633d7..93b09daf2776c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25046,7 +25046,7 @@ in rrootage = callPackage ../games/rrootage { }; - saga = callPackage ../applications/gis/saga { + saga = libsForQt514.callPackage ../applications/gis/saga { inherit (darwin.apple_sdk.frameworks) Cocoa; }; From 63cf375edc0c05de5ab9bb5fb4e99a8438020727 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:41:33 -0500 Subject: [PATCH 49/59] vlc: mark broken with Qt 5.15 --- pkgs/applications/video/vlc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index e655e0fbff465d..365eb8cd991d53 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -99,5 +99,6 @@ stdenv.mkDerivation rec { homepage = "http://www.videolan.org/vlc/"; license = licenses.lgpl21Plus; platforms = platforms.linux; + broken = versionAtLeast qtbase.version "5.15"; }; } From 60a13a2240b4cafd851a592fcdcc5f4cb90c5e5f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:43:40 -0500 Subject: [PATCH 50/59] herqq: pin to qt514 --- pkgs/development/libraries/herqq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/herqq/default.nix b/pkgs/development/libraries/herqq/default.nix index d3433246b7806d..8dc0df3a9f2fe7 100644 --- a/pkgs/development/libraries/herqq/default.nix +++ b/pkgs/development/libraries/herqq/default.nix @@ -1,11 +1,11 @@ -{ stdenv, qt5, unzip, fetchFromGitHub, qtmultimedia }: +{ stdenv, unzip, fetchFromGitHub, qmake, qtmultimedia, qtbase }: stdenv.mkDerivation rec { version = "2.1.0"; pname = "herqq"; - nativeBuildInputs = [ qt5.qmake ]; - buildInputs = [ qt5.qtbase unzip qtmultimedia ]; + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase unzip qtmultimedia ]; preConfigure = "cd herqq"; src = fetchFromGitHub { From 1c58417138f38ba9d87d259d616ad834afba8874 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:46:41 -0500 Subject: [PATCH 51/59] kotatogram-desktop: properly depend on libdbusmenu --- .../telegram/kotatogram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index cfb41fa9fc52c0..190e0515896968 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchFromGitHub, pkg-config, python3, cmake, ninja -, qtbase, qtimageformats, libsForQt5, hunspell, xdg_utils, ffmpeg_3, openalSoft +, qtbase, qtimageformats, libdbusmenu, hunspell, xdg_utils, ffmpeg_3, openalSoft , lzma, lz4, xxHash, zlib, minizip, openssl, libtgvoip, microsoft_gsl, tl-expected , range-v3 }: @@ -21,7 +21,7 @@ mkDerivation rec { nativeBuildInputs = [ pkg-config python3 cmake ninja ]; buildInputs = [ - qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libsForQt5.libdbusmenu + qtbase qtimageformats ffmpeg_3 openalSoft lzma lz4 xxHash libdbusmenu zlib minizip openssl hunspell libtgvoip microsoft_gsl tl-expected range-v3 ]; From 844da6b948792e95101e0576739d262e4851b973 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 11:49:46 -0500 Subject: [PATCH 52/59] flent: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93b09daf2776c8..885109fb14aa3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3658,7 +3658,7 @@ in flashrom = callPackage ../tools/misc/flashrom { }; - flent = python3Packages.callPackage ../applications/networking/flent { }; + flent = python3Packages.callPackage ../applications/networking/flent { qt5 = qt514; }; flpsed = callPackage ../applications/editors/flpsed { }; From 0e3fe30d5e0349e234e9003a96bcb6271ccef4cf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 12:12:24 -0500 Subject: [PATCH 53/59] vtkWithQt5: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 885109fb14aa3c..6dfe1e26557022 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15695,7 +15695,7 @@ in }); }; - vtkWithQt5 = vtk.override { qtLib = qt5; }; + vtkWithQt5 = vtk.override { qtLib = qt514; }; vxl = callPackage ../development/libraries/vxl { libpng = libpng12; From 8d52422167d000102c590435d48b6ec5ef423fcd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 12:13:53 -0500 Subject: [PATCH 54/59] opentoonz: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dfe1e26557022..b05d604daa957f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22292,7 +22292,7 @@ in opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; - opentoonz = (qt5.overrideScope' (_: _: { + opentoonz = (qt514.overrideScope' (_: _: { libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; })).callPackage ../applications/graphics/opentoonz { }; From 23bed3659d3eb978a0927feb68aaa19c79c7d20f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 13:50:44 -0500 Subject: [PATCH 55/59] python-qt: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b05d604daa957f..29e8a7685b23f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14755,7 +14755,7 @@ in python-qt = callPackage ../development/libraries/python-qt { python = python27; - inherit (qt5) qmake qttools qtwebengine qtxmlpatterns; + inherit (qt514) qmake qttools qtwebengine qtxmlpatterns; }; pyotherside = libsForQt5.callPackage ../development/libraries/pyotherside {}; From 5a9ecfbeefcbe26e25faa38f8208b727fb384d0b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:04:35 -0500 Subject: [PATCH 56/59] pyside2: pin to qt514 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b10662bb15bcf1..75918b3d8b8d5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5314,9 +5314,9 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake; inherit qt5; }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake qt5 ninja; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja; inherit qt5; }); pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; From e2585d78a9fd2d8e340b0e3c4df32ace5a10676f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:07:42 -0500 Subject: [PATCH 57/59] shiboken2: pin to qt514 --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75918b3d8b8d5c..5aafe443a113fc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6376,7 +6376,7 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake qt5 llvmPackages; }); + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages; inherit qt5; }); shippai = callPackage ../development/python-modules/shippai { }; From 8a216e785c86330ef83e39098e0301357d227bf5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 14:59:23 -0500 Subject: [PATCH 58/59] google-musicmanager: pin to qt514 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29e8a7685b23f3..0f979eccd3632c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20410,7 +20410,7 @@ in inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { - inherit (qt5) qtbase qtwebkit; + inherit (qt514) qtbase qtwebkit; # Downgrade to 1.34 to get libidn.so.11 libidn = (libidn.overrideAttrs (oldAttrs: { src = fetchurl { From 78b8ce73c699fd77432878c08392e327509c2d8e Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 7 Sep 2020 15:00:56 -0500 Subject: [PATCH 59/59] Pin broken packages to Qt 5.14 --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f979eccd3632c..4aded226787083 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5293,7 +5293,7 @@ in lzip = callPackage ../tools/compression/lzip { }; - luxcorerender = callPackage ../tools/graphics/luxcorerender { }; + luxcorerender = callPackage ../tools/graphics/luxcorerender { qt5 = qt514; }; xz = callPackage ../tools/compression/xz { }; lzma = xz; # TODO: move to aliases.nix @@ -20719,7 +20719,7 @@ in moe = callPackage ../applications/editors/moe { }; - multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb {}; + multibootusb = libsForQt514.callPackage ../applications/misc/multibootusb { qt5 = qt514; }; praat = callPackage ../applications/audio/praat { }; @@ -25050,7 +25050,7 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa; }; - samplv1 = callPackage ../applications/audio/samplv1 { }; + samplv1 = callPackage ../applications/audio/samplv1 { qt5 = qt514; }; sauerbraten = callPackage ../games/sauerbraten {};