forked from mirrors/nixpkgs
Revert "cairo: Add ApplicationServices as propagatedBuildInput"
This reverts commit 0f67005c4a
.
This commit is contained in:
parent
755c2929dd
commit
ab0bb24973
pkgs/development/libraries
|
@ -48,6 +48,7 @@ stdenv.mkDerivation rec {
|
||||||
] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
CoreGraphics
|
CoreGraphics
|
||||||
CoreText
|
CoreText
|
||||||
|
ApplicationServices
|
||||||
Carbon
|
Carbon
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -56,9 +57,6 @@ stdenv.mkDerivation rec {
|
||||||
++ optionals xcbSupport [ libxcb xcbutil ]
|
++ optionals xcbSupport [ libxcb xcbutil ]
|
||||||
++ optional gobjectSupport glib
|
++ optional gobjectSupport glib
|
||||||
++ optional glSupport mesa_noglu
|
++ optional glSupport mesa_noglu
|
||||||
++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
|
||||||
ApplicationServices
|
|
||||||
])
|
|
||||||
; # TODO: maybe liblzo but what would it be for here?
|
; # TODO: maybe liblzo but what would it be for here?
|
||||||
|
|
||||||
configureFlags = if stdenv.isDarwin then [
|
configureFlags = if stdenv.isDarwin then [
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
|
{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
|
||||||
, bzip2, libcroco, libintlOrEmpty
|
, bzip2, libcroco, libintlOrEmpty, darwin
|
||||||
, withGTK ? false, gtk3 ? null
|
, withGTK ? false, gtk3 ? null
|
||||||
, gobjectIntrospection ? null, enableIntrospection ? false }:
|
, gobjectIntrospection ? null, enableIntrospection ? false }:
|
||||||
|
|
||||||
|
@ -22,7 +22,10 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
|
propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ]
|
||||||
|
++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
|
||||||
|
ApplicationServices
|
||||||
|
]);
|
||||||
|
|
||||||
configureFlags = [ "--enable-introspection=auto" ]
|
configureFlags = [ "--enable-introspection=auto" ]
|
||||||
++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
|
++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
|
||||||
|
|
Loading…
Reference in a new issue