cairomm_1_16: fix darwin build (#123020)
This commit is contained in:
parent
2620ac69c0
commit
f8a8ac2331
|
@ -8,6 +8,7 @@
|
|||
, cairo
|
||||
, fontconfig
|
||||
, libsigcxx30
|
||||
, ApplicationServices
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
|
@ -30,6 +31,8 @@ stdenv.mkDerivation rec {
|
|||
buildInputs = [
|
||||
boost # for tests
|
||||
fontconfig
|
||||
] ++ lib.optionals stdenv.isDarwin [
|
||||
ApplicationServices
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
@ -47,7 +50,8 @@ stdenv.mkDerivation rec {
|
|||
BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
|
||||
BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
|
||||
|
||||
doCheck = true;
|
||||
# Tests fail on Darwin, possibly because of sandboxing.
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A 2D graphics library with support for multiple output devices";
|
||||
|
|
|
@ -14967,7 +14967,9 @@ in
|
|||
|
||||
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 {
|
||||
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
|
||||
|
|
Loading…
Reference in a new issue