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

graphite2: fix #2800 by setting INSTALL_NAME_DIR

Browse Source
This commit is contained in:
John Wiegley
2014-06-01 05:51:16 +00:00
parent 2481a71c3c
commit e719f64a05
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/silgraphite/graphite2.nix
View File

@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
buildInputs = [ pkgconfig freetype cmake ];
patches = stdenv.lib.optionals stdenv.isDarwin [ ./macosx.patch ];
meta = {
description = "An advanced font engine";
maintainers = [ stdenv.lib.maintainers.raskin ];

13
pkgs/development/libraries/silgraphite/macosx.patch Normal file
View File

@@ -0,0 +1,13 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -102,7 +102,8 @@ set_target_properties(graphite2 PROPERTIES PUBLIC_HEADER "${GRAPHITE_HEADERS}"
VERSION ${GRAPHITE_VERSION}
LT_VERSION_CURRENT ${GRAPHITE_API_CURRENT}
LT_VERSION_REVISION ${GRAPHITE_API_REVISION}
- LT_VERSION_AGE ${GRAPHITE_API_AGE})
+ LT_VERSION_AGE ${GRAPHITE_API_AGE}
+ INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
if (${CMAKE_BUILD_TYPE} STREQUAL "ClangASN")
set(GRAPHITE_LINK_FLAGS "-fsanitize=address")