From b9078e581b20e613dfd3a36a262d2da31c74ce81 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 18 Sep 2021 19:42:06 +0200 Subject: [PATCH] qt515.qtwebengine: fix build w/glibc-2.34 Derived from Fedora 35: https://src.fedoraproject.org/rpms/qt5-qtwebengine/c/d122c011631137b79455850c363676c655cf9e09?branch=rawhide Failing Hydra build: https://hydra.nixos.org/build/153232768 --- pkgs/development/libraries/qt-5/5.15/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix index 5943a80a701e..74b92dda1df2 100644 --- a/pkgs/development/libraries/qt-5/5.15/default.nix +++ b/pkgs/development/libraries/qt-5/5.15/default.nix @@ -56,7 +56,13 @@ let qtdeclarative = [ ./qtdeclarative.patch ]; qtscript = [ ./qtscript.patch ]; qtserialport = [ ./qtserialport.patch ]; - qtwebengine = lib.optionals stdenv.isDarwin [ + qtwebengine = [ + # glibc 2.34 compat + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/qt5-qtwebengine/raw/d122c011631137b79455850c363676c655cf9e09/f/qtwebengine-everywhere-src-5.15.5-SIGSTKSZ.patch"; + sha256 = "sha256-1zS7nvbe5ZVuW/wSNOUBc2Qz0aB483Kfnz1JbzKEI+M="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-mac-dont-set-dsymutil-path.patch ];