From f5e2cfc779975fd994f8034d8a6dc2ed68dea486 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 May 2018 16:30:07 +0200 Subject: [PATCH 1/2] Revert "libsForQt5.qscintilla: 2.9.4 -> 2.10.3" This reverts commit 8ee6a03a3e75c6aaf4d7cf53bd6ffc6892d89950. --- pkgs/development/libraries/qscintilla/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index 281dbe0a5eda..f442e1bf908e 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) ] From be153f6323599a0128d384471c42e1f10d0a1f00 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 2 May 2018 16:34:24 +0200 Subject: [PATCH 2/2] libsForQt5.qscintilla: don't apply darwin patch on non-darwin systems --- pkgs/development/libraries/qscintilla/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index f442e1bf908e..bc3b44413054 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -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;