nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

qscintilla: Fix qt4 build

Browse Source 
(#73163)
(cherry picked from commit eb1cd0d27d)
This commit is contained in:
Lancelot SIX
2019-11-13 00:13:21 +01:00
committed by Renaud
parent e6a37ef446
commit 191dc255dd
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,5 @@ in stdenv.mkDerivation rec {
license = with licenses; [ gpl2 gpl3 ]; # and commercial
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.unix;
broken = !withQt5;
};
}

6
pkgs/development/libraries/qscintilla/fix-qt4-build.patch
View File

@@ -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 <QByteArray>
#include <QPoint>