public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cairo: Add ApplicationServices as propagatedBuildInput

Browse Source 
Noticed that it caused depending packages to fail, like librsvg, imagemagiv, graphviz.
This commit is contained in:
Johannes Bornhold 2016-12-24 01:11:19 +01:00
parent 8f7adffe4d
commit 0f67005c4a
2 changed files with 5 additions and 6 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,7 +48,6 @@ 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
]); ]);
@ -57,6 +56,9 @@ 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 [

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

@ -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, darwin , bzip2, libcroco, libintlOrEmpty
, withGTK ? false, gtk3 ? null , withGTK ? false, gtk3 ? null
, gobjectIntrospection ? null, enableIntrospection ? false }: , gobjectIntrospection ? null, enableIntrospection ? false }:
@ -22,10 +22,7 @@ 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";