From ab0bb24973269a51aa0a58a1de4199d8b2eb04d8 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan <daiderd@gmail.com> Date: Mon, 9 Jan 2017 20:58:16 +0100 Subject: [PATCH] Revert "cairo: Add ApplicationServices as propagatedBuildInput" This reverts commit 0f67005c4a2651ab0d9a48468a4873cff3551b8b. --- pkgs/development/libraries/cairo/default.nix | 4 +--- pkgs/development/libraries/librsvg/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 5b40f27674da..7df72bc05605 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { ] ++ libintlOrEmpty ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ CoreGraphics CoreText + ApplicationServices Carbon ]); @@ -56,9 +57,6 @@ 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 409307fb52b0..ebd0f79cd47b 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 +, bzip2, libcroco, libintlOrEmpty, darwin , withGTK ? false, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -22,7 +22,10 @@ stdenv.mkDerivation rec { 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" ] ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";