mirror/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-29 15:43:00 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Revert "cairo: Add ApplicationServices as propagatedBuildInput"

Browse Source 
This reverts commit 0f67005c4a.
This commit is contained in:
Daiderd Jordan 2017-01-09 20:58:16 +01:00
parent 755c2929dd
commit ab0bb24973
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/cairo/default.nix
View File

@ -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 [

7
pkgs/development/libraries/librsvg/default.nix
View File

@ -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";