diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2018-03-13 09:47:08 +0000 |
|---|---|---|
| committer | Matthew Pickering <matthewtpickering@gmail.com> | 2018-03-21 08:28:00 +0000 |
| commit | 3391006fd584fadb89fac191407c08a87d307f11 (patch) | |
| tree | ee32c122ceea699fc08d902615239ef9753e1a4c /pkgs/development/libraries/qscintilla | |
| parent | de6360b63e322ad5b301f732f225626bc5807e5c (diff) | |
| download | nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar.gz nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar.bz2 nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar.lz nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar.xz nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.tar.zst nixpkgs-3391006fd584fadb89fac191407c08a87d307f11.zip | |
Fix qscintilla qt5 darwin build
Diffstat (limited to 'pkgs/development/libraries/qscintilla')
| -rw-r--r-- | pkgs/development/libraries/qscintilla/default.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index d6bd90fa47d..f442e1bf908 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -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 = '' |