qscintilla: support qt5
This commit is contained in:
parent
59dbcefaa7
commit
9452abe684
@ -1,18 +1,23 @@
|
||||
{ stdenv, fetchurl, qt4, qmake4Hook }:
|
||||
{ stdenv, fetchurl
|
||||
, qt4 ? null, qmake4Hook ? null
|
||||
, withQt5 ? false, qtbase ? null, qmakeHook ? null
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla";
|
||||
version = "2.9";
|
||||
|
||||
name = "${pname}-${version}";
|
||||
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
|
||||
sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
|
||||
};
|
||||
|
||||
buildInputs = [ qt4 ];
|
||||
nativeBuildInputs = [ qmake4Hook ];
|
||||
buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
|
||||
nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
cd Qt4Qt5
|
||||
@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
|
||||
qscintilla.pro
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A Qt port of the Scintilla text editing library";
|
||||
longDescription = ''
|
||||
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor
|
||||
@ -40,7 +45,7 @@ stdenv.mkDerivation rec {
|
||||
background colours and multiple fonts.
|
||||
'';
|
||||
homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
|
||||
license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
license = with licenses; [ gpl2 gpl3 ]; # and commercial
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
@ -9125,6 +9125,10 @@ in
|
||||
|
||||
qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
|
||||
|
||||
qscintilla = callPackage ../development/libraries/qscintilla {
|
||||
withQt5 = true;
|
||||
};
|
||||
|
||||
qtkeychain = callPackage ../development/libraries/qtkeychain {
|
||||
withQt5 = true;
|
||||
};
|
||||
@ -14516,7 +14520,7 @@ in
|
||||
qscreenshot = callPackage ../applications/graphics/qscreenshot {
|
||||
qt = qt4;
|
||||
};
|
||||
|
||||
|
||||
qsyncthingtray = qt5.callPackage ../applications/misc/qsyncthingtray { };
|
||||
|
||||
qsynth = callPackage ../applications/audio/qsynth { };
|
||||
|
Loading…
Reference in New Issue
Block a user