From a40ec61d992ad4b8a88bc5215262c307ce5ae36e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 21 May 2020 17:28:29 +0200 Subject: [PATCH] falkon: fix build with qt5 5.14.x --- .../networking/browsers/falkon/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/falkon/default.nix b/pkgs/applications/networking/browsers/falkon/default.nix index f9e814a0941b..3c2aace79b26 100644 --- a/pkgs/applications/networking/browsers/falkon/default.nix +++ b/pkgs/applications/networking/browsers/falkon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, lib, fetchFromGitHub +{ stdenv, mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, qmake , libpthreadstubs, libxcb, libXdmcp , qtsvg, qttools, qtwebengine, qtx11extras @@ -17,6 +17,14 @@ mkDerivation rec { sha256 = "1w64slh9wpcfi4v7ds9wci1zvwh0dh787ndpi6hd4kmdgnswvsw7"; }; + patches = [ + # fixes build with qt5 5.14 + (fetchpatch { + url = "https://github.com/KDE/falkon/commit/bbde5c6955c43bc744ed2c4024598495de908f2a.diff"; + sha256 = "0f7qcddvvdnij3di0acg7jwvwfwyd0xizlav4wccclbj8x7qp5ld"; + }) + ]; + preConfigure = '' export NONBLOCK_JS_DIALOGS=true export KDE_INTEGRATION=true