diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 33e57a682b97..a8be20b73b12 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -32,7 +32,8 @@ in stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; + patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++ + (lib.optional (!withQt5) ./fix-qt4-build.patch ); # Make sure that libqscintilla2.so is available in $out/lib since it is expected # by some packages such as sqlitebrowser @@ -72,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 new file mode 100644 index 000000000000..520a55b1ea21 --- /dev/null +++ b/pkgs/development/libraries/qscintilla/fix-qt4-build.patch @@ -0,0 +1,11 @@ +diff -ur QScintilla_gpl-2.11.2/Qt4Qt5/Qsci/qsciscintillabase.h QScintilla_gpl-2.11.2-fix/Qt4Qt5/Qsci/qsciscintillabase.h +--- Qt4Qt5/Qsci/qsciscintillabase.h 2019-06-25 14:49:27.000000000 +0200 ++++ Qt4Qt5-fix/Qsci/qsciscintillabase.h 2019-10-04 10:22:26.337474261 +0200 +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include +