public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cairomm_1_16: fix darwin build (#123020)

Browse Source
This commit is contained in:
Stéphan Kochen 2021-05-15 21:28:44 +02:00 committed by GitHub
parent 2620ac69c0
commit f8a8ac2331
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/cairomm/1.16.nix
View File

@ -8,6 +8,7 @@
, cairo , cairo
, fontconfig , fontconfig
, libsigcxx30 , libsigcxx30
, ApplicationServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
boost # for tests boost # for tests
fontconfig fontconfig
] ++ lib.optionals stdenv.isDarwin [
ApplicationServices
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -47,7 +50,8 @@ stdenv.mkDerivation rec {
BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
doCheck = true; # Tests fail on Darwin, possibly because of sandboxing.
doCheck = !stdenv.isDarwin;
meta = with lib; { meta = with lib; {
description = "A 2D graphics library with support for multiple output devices"; description = "A 2D graphics library with support for multiple output devices";

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

@ -14967,7 +14967,9 @@ in
cairomm = callPackage ../development/libraries/cairomm { }; cairomm = callPackage ../development/libraries/cairomm { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { }; cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
pango = callPackage ../development/libraries/pango { pango = callPackage ../development/libraries/pango {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; }; harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };