diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-07-09 12:30:28 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-07-23 09:11:31 +0000 |
commit | 55cc63c079f49e81d695a25bc2f5b3902f2bd290 (patch) | |
tree | e705335d97f50b927c76ccb4a3fbde9fab8372b9 /nixpkgs/pkgs/development/libraries/silgraphite | |
parent | c26eb6f74d9393127a21eee7a9620a920769f613 (diff) | |
parent | 87807e64a5ef5206b745a40af118c7be8db73681 (diff) | |
download | nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.gz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.bz2 nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.lz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.xz nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.tar.zst nixlib-55cc63c079f49e81d695a25bc2f5b3902f2bd290.zip |
Merge commit '87807e64a5ef5206b745a40af118c7be8db73681'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/silgraphite')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix index cd737a82a293..25f4b5e13177 100644 --- a/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/nixpkgs/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,4 +1,11 @@ -{ lib, stdenv, fetchurl, pkg-config, freetype, cmake }: +{ lib +, stdenv +, fetchurl +, pkg-config +, freetype +, cmake +, static ? stdenv.hostPlatform.isStatic +}: stdenv.mkDerivation rec { version = "1.3.14"; @@ -15,7 +22,22 @@ stdenv.mkDerivation rec { patches = lib.optionals stdenv.isDarwin [ ./macosx.patch ]; - doCheck = false; # fails, probably missing something + cmakeFlags = lib.optionals static [ + "-DBUILD_SHARED_LIBS=OFF" + ]; + + # Remove a test that fails to statically link (undefined reference to png and + # freetype symbols) + postConfigure = lib.optionals static '' + sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/src/ + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}$PWD/src/ + ''; + + doCheck = true; meta = with lib; { description = "An advanced font engine"; |