diff options
| -rw-r--r-- | pkgs/development/libraries/cairo/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7df72bc056050..5b40f27674da1 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText - ApplicationServices Carbon ]); @@ -57,6 +56,9 @@ stdenv.mkDerivation rec { ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib ++ optional glSupport mesa_noglu + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + ApplicationServices + ]) ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ebd0f79cd47b7..409307fb52b0a 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf -, bzip2, libcroco, libintlOrEmpty, darwin +, bzip2, libcroco, libintlOrEmpty , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -22,10 +22,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; - nativeBuildInputs = [ pkgconfig ] - ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ - ApplicationServices - ]); + nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-introspection=auto" ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; |