libsForQt5.qtwebengine: build using python3 (523a65c9) · Commits · nix / nixpkgs

pkgs/development/libraries/qt-5/5.12/default.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.

		{ newScope
		, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
		, bison, cups ? null, harfbuzz, libGL, perl
		, bison, cups ? null, harfbuzz, libGL, perl, python2
		, gstreamer, gst-plugins-base, gtk3, dconf
		, darwin
		, buildPackages
		@@ -205,6 +205,7 @@ let
		qtwayland = callPackage ../modules/qtwayland.nix {};
		qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
		qtwebengine = callPackage ../modules/qtwebengine.nix {
		python = python2;
		inherit (darwin) cctools libobjc libunwind xnu;
		inherit (darwin.apple_sdk.libs) sandbox;
		inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

pkgs/development/libraries/qt-5/5.14/default.nix

+2 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ top-level attribute to `top-level/all-packages.nix`.

		{ newScope
		, lib, stdenv, fetchurl, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
		, bison, cups ? null, harfbuzz, libGL, perl
		, bison, cups ? null, harfbuzz, libGL, perl, python2
		, gstreamer, gst-plugins-base, gtk3, dconf
		, darwin
		, buildPackages
		@@ -204,6 +204,7 @@ let
		qtwayland = callPackage ../modules/qtwayland.nix {};
		qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
		qtwebengine = callPackage ../modules/qtwebengine.nix {
		python = python2;
		inherit (darwin) cctools libobjc libunwind xnu;
		inherit (darwin.apple_sdk.libs) sandbox;
		inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

pkgs/development/libraries/qt-5/5.15/default.nix

+19 −2

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ Check for any minor version changes.

		{ newScope
		, lib, stdenv, fetchurl, fetchgit, fetchpatch, fetchFromGitHub, makeSetupHook, makeWrapper
		, bison, cups ? null, harfbuzz, libGL, perl
		, bison, cups ? null, harfbuzz, libGL, perl, python3
		, gstreamer, gst-plugins-base, gtk3, dconf
		, darwin
		, buildPackages
		@@ -63,7 +63,18 @@ let
		];
		qtscript = [ ./qtscript.patch ];
		qtserialport = [ ./qtserialport.patch ];
		qtwebengine = lib.optionals stdenv.isDarwin [
		qtwebengine = [
		(fetchpatch {
		url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-python3.patch";
		hash = "sha256-rUSDwTucXVP3Obdck7LRTeKZ+JYQSNhQ7+W31uHZ9yM=";
		})
		(fetchpatch {
		url = "https://github.com/archlinux/svntogit-packages/raw/372ae3de526f783bdcb5d51b997fbf511055466a/trunk/qt5-webengine-chromium-python3.patch";
		stripLen = 1;
		extraPrefix = "src/3rdparty/";
		hash = "sha256-BODOw1ksPPns2fmMrk6KC5Po513xB0f1ycbsIL9MmHE=";
		})
		] ++ lib.optionals stdenv.isDarwin [
		./qtwebengine-darwin-no-platform-check.patch
		./qtwebengine-mac-dont-set-dsymutil-path.patch
		];
		@@ -164,6 +175,12 @@ let
		qtwebchannel = callPackage ../modules/qtwebchannel.nix {};
		qtwebengine = callPackage ../modules/qtwebengine.nix {
		inherit (srcs.qtwebengine) version;
		python = python3;
		postPatch = ''
		# update catapult for python3 compatibility
		rm -r src/3rdparty/chromium/third_party/catapult
		cp -r ${srcs.catapult} src/3rdparty/chromium/third_party/catapult
		'';
		inherit (darwin) cctools libobjc libunwind xnu;
		inherit (darwin.apple_sdk.libs) sandbox;
		inherit (darwin.apple_sdk.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit

pkgs/development/libraries/qt-5/5.15/srcs.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,12 @@ lib.mapAttrs mk (lib.importJSON ./srcs-generated.json)
		version = "5.212.0-alpha4";
		};

		catapult = fetchgit {
		url = "https://chromium.googlesource.com/catapult";
		rev = "5eedfe23148a234211ba477f76fc2ea2e8529189";
		hash = "sha256-LPfBCEB5tJOljXpptsNk0sHGtJf/wIRL7fccN79Nh6o=";
		};

		qtwebengine =
		let
		branchName = "5.15.11";

pkgs/development/libraries/qt-5/modules/qtwebengine.nix

+4 −3

Original line number	Diff line number	Diff line
		{ qtModule
		, qtdeclarative, qtquickcontrols, qtlocation, qtwebchannel

		, bison, flex, git, gperf, ninja, pkg-config, python2, which
		, bison, flex, git, gperf, ninja, pkg-config, python, which
		, nodejs, qtbase, perl

		, xorg, libXcursor, libXScrnSaver, libXrandr, libXtst
		@@ -24,13 +24,14 @@
		, qtCompatVersion
		, pipewireSupport ? stdenv.isLinux
		, pipewire_0_2
		, postPatch ? ""
		}:

		qtModule {
		pname = "qtwebengine";
		qtInputs = [ qtdeclarative qtquickcontrols qtlocation qtwebchannel ];
		nativeBuildInputs = [
		bison flex git gperf ninja pkg-config python2 which gn nodejs
		bison flex git gperf ninja pkg-config python which gn nodejs
		] ++ lib.optional stdenv.isDarwin xcbuild;
		doCheck = true;
		outputs = [ "bin" "dev" "out" ];
		@@ -102,7 +103,7 @@ qtModule {
		'' else ''
		substituteInPlace src/3rdparty/chromium/base/mac/mach_port_broker.mm \
		--replace "audit_token_to_pid(msg.trailer.msgh_audit)" "msg.trailer.msgh_audit.val[5]"
		''));
		'')) + postPatch;

		NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isGNU [
		# with gcc8, -Wclass-memaccess became part of -Wall and this exceeds the logging limit

Admin message