From 3fd3e66eab3d8e48bfa62a51a859de727c8466d8 Mon Sep 17 00:00:00 2001 From: Hannes Weisbach Date: Mon, 21 Sep 2020 09:24:43 +0200 Subject: [PATCH 1/2] fontconfig: Add CoreFoundation to buildInputs 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 72df121200e08..570037cab7e58 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 - ]; + ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae19e77cadb87..2ec3f5dff0828 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12311,7 +12311,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 { }; From 3cb5d8ca844654d697dee94a7c59e2a723e0c826 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 21 Mar 2021 17:19:55 -0400 Subject: [PATCH 2/2] fontconfig: replace stdenv.lib with lib Co-authored-by: Pavol Rusnak --- pkgs/development/libraries/fontconfig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 570037cab7e58..c1a62c16e756d 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ expat - ] ++ stdenv.lib.optional stdenv.isDarwin CoreFoundation; + ] ++ lib.optional stdenv.isDarwin CoreFoundation; propagatedBuildInputs = [ freetype