From 191dc255ddfa2fd341d865ac428fd96b61c98514 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Wed, 13 Nov 2019 00:13:21 +0100 Subject: [PATCH] qscintilla: Fix qt4 build (#73163) (cherry picked from commit eb1cd0d27d42f5a3d969a5a87330d1322812b09c) --- pkgs/development/libraries/qscintilla/default.nix | 1 - pkgs/development/libraries/qscintilla/fix-qt4-build.patch | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index bf3d629d357a..a8be20b73b12 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -73,6 +73,5 @@ in stdenv.mkDerivation rec { license = with licenses; [ gpl2 gpl3 ]; # and commercial maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.unix; - broken = !withQt5; }; } diff --git a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch b/pkgs/development/libraries/qscintilla/fix-qt4-build.patch index 2d4339f35f43..6b30c54e46f7 100644 --- a/pkgs/development/libraries/qscintilla/fix-qt4-build.patch +++ b/pkgs/development/libraries/qscintilla/fix-qt4-build.patch @@ -1,6 +1,6 @@ -diff -ur QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h ---- QScintilla_gpl-2.9.4/Qt4Qt5/Qsci/qsciscintillabase.h 2016-12-25 23:01:54.000000000 +0100 -+++ QScintilla_gpl-2.9.4-fix/Qt4Qt5/Qsci/qsciscintillabase.h 2019-10-22 09:07:55.429260135 +0200 +diff -ur Qt4Qt5/Qsci/qsciscintillabase.h Qt4Qt5/Qsci/qsciscintillabase.h +--- Qt4Qt5/Qsci/qsciscintillabase.h 2016-12-25 23:01:54.000000000 +0100 ++++ Qt4Qt5/Qsci/qsciscintillabase.h 2019-10-22 09:07:55.429260135 +0200 @@ -31,6 +31,7 @@ #include #include