diff options
| author | hannesweisbach <hannesweisbach@users.noreply.github.com> | 2021-03-21 23:28:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 18:28:11 -0400 |
| commit | 869b1090b805493a0a81d13d7c28d28823dbddb4 (patch) | |
| tree | 9c2d3a5bec2d42167b639f165a301b8b6c5bfbd7 | |
| parent | de2c3e08c090907b555a8e26f4af73cebf800d71 (diff) | |
| download | nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar.gz nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar.bz2 nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar.lz nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar.xz nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.tar.zst nixpkgs-869b1090b805493a0a81d13d7c28d28823dbddb4.zip | |
fontconfig: Add CoreFoundation to buildInputs (#98379)
Get rid of non-absolute RPATH reference to CoreFoundation
| -rw-r--r-- | pkgs/development/libraries/fontconfig/default.nix | 3 | ||||
| -rw-r--r-- | 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 { }; |