diff options
| author | Jörg Thalheim <joerg@higgsboson.tk> | 2017-01-08 23:43:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-08 23:43:24 +0100 |
| commit | bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d (patch) | |
| tree | c459ce4d2fad6ae5ea461145326c6eddc3986b6b /pkgs | |
| parent | 90ea0c000cfa3fa76274592291c61aeddce49698 (diff) | |
| parent | 22dbb82129bf83c406777059e7586b79cba98254 (diff) | |
| download | nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar.gz nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar.bz2 nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar.lz nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar.xz nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.tar.zst nixlib-bcf8d8c6ef56e0d1a5672f9d03e62c9f9adf2b0d.zip | |
Merge pull request #21634 from peterhoeg/f/qscint
qscintilla: 2.9 -> 2.9.4 and support for qt5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 26 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 20 insertions, 10 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d5f4389169b0..928ff5f788be 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, qt4, qmake4Hook }: +{ stdenv, fetchurl, unzip +, qt4 ? null, qmake4Hook ? null +, withQt5 ? false, qtbase ? null, qmakeHook ? null +}: stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.9"; + version = "2.9.4"; - 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"; + url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; + sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; }; - buildInputs = [ qt4 ]; - nativeBuildInputs = [ qmake4Hook ]; + buildInputs = if withQt5 then [ qtbase ] else [ qt4 ]; + nativeBuildInputs = [ unzip ] ++ (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,8 @@ 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; + maintainers = with maintainers; [ peterhoeg ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5152734365c4..e49e4260f5fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9200,6 +9200,10 @@ in qca-qt5 = callPackage ../development/libraries/qca-qt5 { }; + qscintilla = callPackage ../development/libraries/qscintilla { + withQt5 = true; + }; + qtkeychain = callPackage ../development/libraries/qtkeychain { withQt5 = true; }; |