Fix qscintilla qt5 darwin build
This commit is contained in:
parent
de6360b63e
commit
3391006fd5
@ -3,6 +3,11 @@
|
||||
, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null
|
||||
}:
|
||||
|
||||
# Fix Xcode 8 compilation problem
|
||||
let xcodePatch =
|
||||
fetchurl { url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
|
||||
sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9"; };
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "qscintilla";
|
||||
version = "2.9.4";
|
||||
@ -19,6 +24,9 @@ stdenv.mkDerivation rec {
|
||||
nativeBuildInputs = [ unzip ]
|
||||
++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
|
||||
|
||||
|
||||
patches = [] ++ lib.optional withQt5 [ xcodePatch ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
|
Loading…
Reference in New Issue
Block a user