From 869b1090b805493a0a81d13d7c28d28823dbddb4 Mon Sep 17 00:00:00 2001 From: hannesweisbach Date: Sun, 21 Mar 2021 23:28:11 +0100 Subject: [PATCH] fontconfig: Add CoreFoundation to buildInputs (#98379) Get rid of non-absolute RPATH reference to CoreFoundation --- pkgs/development/libraries/fontconfig/default.nix | 3 ++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index daedaefcf9c..a7f8fa89c16 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -9,6 +9,7 @@ , gperf , dejavu_fonts , autoreconfHook +, CoreFoundation }: stdenv.mkDerivation rec { @@ -73,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ]; + ] ++ lib.optional stdenv.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f60ae8ece10..b7059f1fe22 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14004,7 +14004,9 @@ in cfitsio = callPackage ../development/libraries/cfitsio { }; - fontconfig = callPackage ../development/libraries/fontconfig { }; + fontconfig = callPackage ../development/libraries/fontconfig { + inherit (darwin.apple_sdk.frameworks) CoreFoundation; + }; folly = callPackage ../development/libraries/folly { };