Skip to content

qscintilla: Fix qt4 build #70391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterhoeg merged 1 commit into from
Oct 22, 2019
Merged

qscintilla: Fix qt4 build #70391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkgs/development/libraries/qscintilla/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -72,6 +73,5 @@ in stdenv.mkDerivation rec {
license = with licenses; [ gpl2 gpl3 ]; # and commercial
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
broken = !withQt5;
};
}
11 changes: 11 additions & 0 deletions pkgs/development/libraries/qscintilla/fix-qt4-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <QByteArray>
#include <QPoint>
#include <QTimer>
+#include <QUrl>

#include <Qsci/qsciglobal.h>