diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index a93c2b67d43f..a71bd758dc4d 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 808562772f9e..b8594823b6ab 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 616bf22ff13a..178150e26549 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix index 35d8eae1abb3..f566c621f249 100644 --- a/pkgs/development/libraries/qt-5/5.15/srcs.nix +++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix @@ -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"; diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index 120caae9a440..d337b030ab8f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -1,7 +1,7 @@ { 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be8e779f5535..2d524ae61b3a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22004,7 +22004,7 @@ with pkgs; (import ../development/libraries/qt-5/5.12) { inherit newScope; inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3 python2; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; inherit buildPackages; @@ -22017,7 +22017,7 @@ with pkgs; (import ../development/libraries/qt-5/5.14) { inherit newScope; inherit lib fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3 python2; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; inherit buildPackages; @@ -22030,7 +22030,7 @@ with pkgs; (import ../development/libraries/qt-5/5.15) { inherit newScope; inherit lib stdenv fetchurl fetchpatch fetchgit fetchFromGitHub makeSetupHook makeWrapper; - inherit bison cups dconf harfbuzz libGL perl gtk3; + inherit bison cups dconf harfbuzz libGL perl gtk3 python3; inherit (gst_all_1) gstreamer gst-plugins-base; inherit darwin; inherit buildPackages;