diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2019-10-04 14:12:07 +0200 |
|---|---|---|
| committer | Lancelot SIX <lsix@lancelotsix.com> | 2019-10-04 14:12:07 +0200 |
| commit | eb1cd0d27d42f5a3d969a5a87330d1322812b09c (patch) | |
| tree | be1e6a5b60595f8a40df0dd73085b3e821f65741 /pkgs/development/libraries/qscintilla | |
| parent | 2455b2e3091d406e9902dc57a9b618860d66adef (diff) | |
qscintilla: Fix qt4 build
Diffstat (limited to 'pkgs/development/libraries/qscintilla')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/qscintilla/fix-qt4-build.patch | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 33e57a682b97b..a8be20b73b12f 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 0000000000000..520a55b1ea210 --- /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 <QByteArray> + #include <QPoint> + #include <QTimer> ++#include <QUrl> + + #include <Qsci/qsciglobal.h> + |