Merge pull request #21894 from johbo/darwin-pangomm

pangomm: Add ApplicationServices on darwin
This commit is contained in:
Daiderd Jordan 2017-01-14 23:56:25 +01:00 committed by GitHub
commit c391904b85
2 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,5 @@
{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm }:
{ stdenv, fetchurl, pkgconfig, pango, glibmm, cairomm
, ApplicationServices }:
let
ver_maj = "2.40";
@ -14,7 +15,9 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkgconfig ];
nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin [
ApplicationServices
];
propagatedBuildInputs = [ pango glibmm cairomm ];
doCheck = true;

View File

@ -7499,7 +7499,9 @@ in
cairomm = callPackage ../development/libraries/cairomm { };
pango = callPackage ../development/libraries/pango { };
pangomm = callPackage ../development/libraries/pangomm { };
pangomm = callPackage ../development/libraries/pangomm {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
pangox_compat = callPackage ../development/libraries/pangox-compat { };