git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #88728 from veprbl/pr/qscintilla_darwin_fix

libsForQt5.qscintilla: fix darwin build

commitf64dddb6838c138e79b70ca53e2553b8ec866cb8 authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSat 23 May 2020, 21:50 (6 years ago) parent56ddb0a04fd664
1 file changed+1−8
pkgs/development/libraries/qscintilla/default.nix+1−8
pkgs/development/libraries/qscintilla/default.nix+1−8
@@ -5,12 +5,6 @@
55}:
66
77let
8− # Fix Xcode 8 compilation problem
9− xcodePatch = fetchurl {
10− url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
11− sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9";
12− };
13−
148 pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
159 version = "2.11.2";
1610
@@ -32,8 +26,7 @@ in stdenv.mkDerivation rec {
3226 ++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
3327 ++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
3428
35− patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++
36− (lib.optional (!withQt5) ./fix-qt4-build.patch );
29+ patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
3730
3831 # Make sure that libqscintilla2.so is available in $out/lib since it is expected
3932 # by some packages such as sqlitebrowser