cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fontconfig: Add CoreFoundation to buildInputs (#98379)

Browse source 
Get rid of non-absolute RPATH reference to CoreFoundation
This commit is contained in:
hannesweisbach 2021-03-21 23:28:11 +01:00 committed by GitHub
parent de2c3e08c0
commit 869b1090b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/libraries/fontconfig/default.nix
View file

@ -9,6 +9,7 @@
, gperf , gperf
, dejavu_fonts , dejavu_fonts
, autoreconfHook , autoreconfHook
, CoreFoundation
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
expat expat
]; ] ++ lib.optional stdenv.isDarwin CoreFoundation;
propagatedBuildInputs = [ propagatedBuildInputs = [
freetype freetype

4
pkgs/top-level/all-packages.nix
View file

@ -14004,7 +14004,9 @@ in
cfitsio = callPackage ../development/libraries/cfitsio { }; 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 { }; folly = callPackage ../development/libraries/folly { };