JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/harfbuzz/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
, icu, graphite2 , icu, graphite2
, withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
, withGraphite2 ? !stdenv.isDarwin # it is small and major distros do include it , withGraphite2 ? true # it is small and major distros do include it
}: }:
# TODO: split non-icu and icu lib into different outputs? # TODO: split non-icu and icu lib into different outputs?

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

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

4
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -22,7 +22,7 @@ rec {
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
export DYLD_LIBRARY_PATH="${poppler}/lib:${graphite2}/lib" export DYLD_LIBRARY_PATH="${poppler}/lib"
'' + '' '' + ''
mkdir -p $out mkdir -p $out
mkdir -p $out/nix-support mkdir -p $out/nix-support
@ -95,7 +95,7 @@ rec {
PATH=$PATH:$out/bin mktexlsr $out/share/texmf* PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
'' + stdenv.lib.optionalString stdenv.isDarwin '' '' + stdenv.lib.optionalString stdenv.isDarwin ''
for prog in $out/bin/*; do for prog in $out/bin/*; do
wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib:${graphite2}/lib" wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
done done
'' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];

2
pkgs/top-level/all-packages.nix
View File

@ -10956,7 +10956,7 @@ let
libXmu libXext xextproto libSM libICE; libXmu libXext xextproto libSM libICE;
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
harfbuzz = harfbuzz.override { harfbuzz = harfbuzz.override {
withIcu = true; withGraphite2 = !stdenv.isDarwin; withIcu = true; withGraphite2 = true;
}; };
}; };