From 1d754bbe941dd048df00c28d08682b8c82319852 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Tue, 7 May 2019 03:43:13 +0900 Subject: [PATCH] qscintilla: fix dylib names on Darwin On Darwin dylibs are intended to have their install names set to their absolute path. Without an absolute path, applications using these libraries will have invalid references embedded, and will be unable to locate the libraries at runtime. --- pkgs/development/libraries/qscintilla/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix index bc3b4441305..2c63f893a2c 100644 --- a/pkgs/development/libraries/qscintilla/default.nix +++ b/pkgs/development/libraries/qscintilla/default.nix @@ -1,6 +1,7 @@ { stdenv, lib, fetchurl, unzip , qt4 ? null, qmake4Hook ? null , withQt5 ? false, qtbase ? null, qtmacextras ? null, qmake ? null +, fixDarwinDylibNames }: # Fix Xcode 8 compilation problem @@ -22,7 +23,8 @@ stdenv.mkDerivation rec { buildInputs = [ (if withQt5 then qtbase else qt4) ] ++ lib.optional (withQt5 && stdenv.isDarwin) qtmacextras; nativeBuildInputs = [ unzip ] - ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]); + ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]) + ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; patches = lib.optional (stdenv.isDarwin && withQt5) [ xcodePatch ];