public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70391 from lsix/fix-qscintilla-qt4 

qscintilla: Fix qt4 build
This commit is contained in:
Peter Hoeg 2019-10-22 10:49:18 +08:00 committed by GitHub
parent 2f28107251 eb1cd0d27d
commit 9f05eb0521
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/qscintilla/default.nix
View File

@ -32,7 +32,8 @@ in stdenv.mkDerivation rec {
++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames; ++ 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 # Make sure that libqscintilla2.so is available in $out/lib since it is expected
# by some packages such as sqlitebrowser # by some packages such as sqlitebrowser
@ -72,6 +73,5 @@ in stdenv.mkDerivation rec {
license = with licenses; [ gpl2 gpl3 ]; # and commercial license = with licenses; [ gpl2 gpl3 ]; # and commercial
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix; platforms = platforms.unix;
broken = !withQt5;
}; };
} }

11
pkgs/development/libraries/qscintilla/fix-qt4-build.patch Normal file
View File

@ -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>