diff options
| author | John Wiegley <johnw@newartisans.com> | 2014-06-01 05:51:16 +0000 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2014-06-01 05:54:23 +0000 |
| commit | e719f64a053d03362957c8ef8087f25a58eb17d4 (patch) | |
| tree | c885efa3eb93ce558ecefb9788871eb1bbbdede1 /pkgs/development/libraries/silgraphite | |
| parent | 2481a71c3c745b4070b89dc37832dc45e9be1382 (diff) | |
| download | nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar.gz nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar.bz2 nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar.lz nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar.xz nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.tar.zst nixpkgs-e719f64a053d03362957c8ef8087f25a58eb17d4.zip | |
graphite2: fix #2800 by setting INSTALL_NAME_DIR
Diffstat (limited to 'pkgs/development/libraries/silgraphite')
| -rw-r--r-- | pkgs/development/libraries/silgraphite/graphite2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/silgraphite/macosx.patch | 13 |
2 files changed, 15 insertions, 0 deletions
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index f874804c001..83f64d1eb00 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -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 ]; diff --git a/pkgs/development/libraries/silgraphite/macosx.patch b/pkgs/development/libraries/silgraphite/macosx.patch new file mode 100644 index 00000000000..7929c1967c8 --- /dev/null +++ b/pkgs/development/libraries/silgraphite/macosx.patch @@ -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") + |