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

qscintilla: support qt5

Browse Source
This commit is contained in:
Peter Hoeg 2017-01-03 13:33:42 +08:00
parent 59dbcefaa7
commit 9452abe684
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,23 @@
{ stdenv, fetchurl, qt4, qmake4Hook }: { stdenv, fetchurl
, qt4 ? null, qmake4Hook ? null
, withQt5 ? false, qtbase ? null, qmakeHook ? null
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qscintilla"; pname = "qscintilla";
version = "2.9"; version = "2.9";
name = "${pname}-${version}"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz"; url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla-gpl-${version}.tar.gz";
sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417"; sha256 = "d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417";
}; };
buildInputs = [ qt4 ]; buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
nativeBuildInputs = [ qmake4Hook ]; nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ];
enableParallelBuilding = true;
preConfigure = '' preConfigure = ''
cd Qt4Qt5 cd Qt4Qt5
@ -23,7 +28,7 @@ stdenv.mkDerivation rec {
qscintilla.pro qscintilla.pro
''; '';
meta = { meta = with stdenv.lib; {
description = "A Qt port of the Scintilla text editing library"; description = "A Qt port of the Scintilla text editing library";
longDescription = '' longDescription = ''
QScintilla is a port to Qt of Neil Hodgson's Scintilla C++ editor 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. background colours and multiple fonts.
''; '';
homepage = http://www.riverbankcomputing.com/software/qscintilla/intro; homepage = http://www.riverbankcomputing.com/software/qscintilla/intro;
license = stdenv.lib.licenses.gpl2; # and gpl3 and commercial license = with licenses; [ gpl2 gpl3 ]; # and commercial
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
}; };
} }

4
pkgs/top-level/all-packages.nix
View File

@ -9125,6 +9125,10 @@ in
qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
qscintilla = callPackage ../development/libraries/qscintilla {
withQt5 = true;
};
qtkeychain = callPackage ../development/libraries/qtkeychain { qtkeychain = callPackage ../development/libraries/qtkeychain {
withQt5 = true; withQt5 = true;
}; };