From 22dbb82129bf83c406777059e7586b79cba98254 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 3 Jan 2017 13:43:16 +0800 Subject: [PATCH] qscintilla: 2.9 -> 2.9.4 --- pkgs/development/libraries/qscintilla/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index b73e9ac79c9..928ff5f788b 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,21 +1,21 @@ -{ stdenv, fetchurl +{ 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}-${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 = if withQt5 then [ qtbase ] else [ qt4 ]; - nativeBuildInputs = if withQt5 then [ qmakeHook ] else [ qmake4Hook ]; + nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]); enableParallelBuilding = true; @@ -47,5 +47,6 @@ stdenv.mkDerivation rec { homepage = http://www.riverbankcomputing.com/software/qscintilla/intro; license = with licenses; [ gpl2 gpl3 ]; # and commercial platforms = platforms.unix; + maintainers = with maintainers; [ peterhoeg ]; }; }