BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #39860 from Ma27/fix-qscintilla

Browse source 
qscintilla: revert bump to fix the build
This commit is contained in:
Peter Hoeg 2018-05-03 14:39:00 +00:00 committed by GitHub
commit 773fe1fefa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/qscintilla/default.nix
View file

@ -10,13 +10,13 @@ let xcodePatch =
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "qscintilla"; pname = "qscintilla";
version = "2.10.3"; version = "2.9.4";
name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}"; name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip"; url = "mirror://sourceforge/pyqt/QScintilla2/QScintilla-${version}/QScintilla_gpl-${version}.zip";
sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi";
}; };
buildInputs = [ (if withQt5 then qtbase else qt4) ] buildInputs = [ (if withQt5 then qtbase else qt4) ]
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
patches = [] ++ lib.optional withQt5 [ xcodePatch ]; patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];
enableParallelBuilding = true; enableParallelBuilding = true;