public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qscintilla qt5 darwin build

Browse Source
This commit is contained in:
Matthew Pickering 2018-03-13 09:47:08 +00:00
parent de6360b63e
commit 3391006fd5
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/qscintilla/default.nix
View File

@ -3,6 +3,11 @@
, withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null , 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 { stdenv.mkDerivation rec {
pname = "qscintilla"; pname = "qscintilla";
version = "2.9.4"; version = "2.9.4";
@ -19,6 +24,9 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ unzip ] nativeBuildInputs = [ unzip ]
++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
patches = [] ++ lib.optional withQt5 [ xcodePatch ];
enableParallelBuilding = true; enableParallelBuilding = true;
preConfigure = '' preConfigure = ''