diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-05-03 14:39:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 14:39:00 +0000 |
| commit | 773fe1fefa3672a6a350ca87b5b919db62817f3c (patch) | |
| tree | 3c17a0aa3cab224721a7345f2a10b5ddb2afd7f4 /pkgs | |
| parent | 1bb22952ce3ab473da345cc5a1403611c3f213c0 (diff) | |
| parent | be153f6323599a0128d384471c42e1f10d0a1f00 (diff) | |
| download | nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar.gz nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar.bz2 nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar.lz nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar.xz nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.tar.zst nixlib-773fe1fefa3672a6a350ca87b5b919db62817f3c.zip | |
Merge pull request #39860 from Ma27/fix-qscintilla
qscintilla: revert bump to fix the build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 281dbe0a5eda..bc3b44413054 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -10,13 +10,13 @@ let xcodePatch = in stdenv.mkDerivation rec { pname = "qscintilla"; - version = "2.10.3"; + 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}.zip"; - sha256 = "0rsx0b0iz5yf3x594kzhi0c2wpbmknv9b0a3rmx5w37bvmpd6qav"; + sha256 = "04678skipydx68zf52vznsfmll2v9aahr66g50lcqbr6xsmgr1yi"; }; buildInputs = [ (if withQt5 then qtbase else qt4) ] @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); - patches = [] ++ lib.optional withQt5 [ xcodePatch ]; + patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ]; enableParallelBuilding = true; |