nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88728 from veprbl/pr/qscintilla_darwin_fix

Browse Source 
libsForQt5.qscintilla: fix darwin build
This commit is contained in:
Dmitry Kalinkin 2020-05-23 21:50:48 -04:00 committed by GitHub
commit f64dddb683
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,12 +5,6 @@
}:
let
# Fix Xcode 8 compilation problem
xcodePatch = fetchurl {
url = "https://raw.githubusercontent.com/Homebrew/formula-patches/a651d71/qscintilla2/xcode-8.patch";
sha256 = "1a88309fdfd421f4458550b710a562c622d72d6e6fdd697107e4a43161d69bc9";
};
pname = "qscintilla-qt${if withQt5 then "5" else "4"}";
version = "2.11.2";
@ -32,8 +26,7 @@ in stdenv.mkDerivation rec {
++ (if withQt5 then [ qmake ] else [ qmake4Hook ])
++ lib.optional stdenv.isDarwin fixDarwinDylibNames;
patches = (lib.optional (stdenv.isDarwin && withQt5) xcodePatch) ++
(lib.optional (!withQt5) ./fix-qt4-build.patch );
patches = lib.optional (!withQt5) ./fix-qt4-build.patch;
# Make sure that libqscintilla2.so is available in $out/lib since it is expected
# by some packages such as sqlitebrowser