diff options
author | Jason \"Don\" O'Conal <lovek323@gmail.com> | 2013-09-07 10:09:11 +1000 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-09-14 15:21:35 +0200 |
commit | 9767a725cc3b9db3d3b59562c79ba5ce45d36c35 (patch) | |
tree | b071e53387ea9feacf95bfa60876a936b606b05e /pkgs/development | |
parent | ad454f3511deadfaeaf0f5235b9be2d269e585d4 (diff) | |
download | nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar.gz nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar.bz2 nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar.lz nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar.xz nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.tar.zst nixpkgs-9767a725cc3b9db3d3b59562c79ba5ce45d36c35.zip |
djvulibre: fix build on darwin (close #931)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libgsf/default.nix | 23 | ||||
-rw-r--r-- | pkgs/development/libraries/librsvg/default.nix | 15 |
2 files changed, 24 insertions, 14 deletions
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix index 249e9291fa3..9253468b8df 100644 --- a/pkgs/development/libraries/libgsf/default.nix +++ b/pkgs/development/libraries/libgsf/default.nix @@ -1,6 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2 -, python, gdk_pixbuf, libiconvOrEmpty -}: +, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }: with { inherit (stdenv.lib) optionals; }; @@ -8,28 +7,32 @@ stdenv.mkDerivation rec { name = "libgsf-1.14.26"; src = fetchurl { - url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; + url = "mirror://gnome/sources/libgsf/1.14/${name}.tar.xz"; sha256 = "1md67l60li7rkma9m6mwchqz6b6q4xsfr38c6n056y6xm8jyf6c9"; }; nativeBuildInputs = [ pkgconfig intltool ]; + buildInputs = [ gettext bzip2 zlib python ]; - propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] ++ libiconvOrEmpty; + propagatedBuildInputs = [ libxml2 glib gdk_pixbuf ] + ++ libiconvOrEmpty + ++ libintlOrEmpty; doCheck = true; - meta = { - homepage = http://www.gnome.org/projects/libgsf; - license = "LGPLv2"; + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + + meta = with stdenv.lib; { description = "GNOME's Structured File Library"; + homepage = http://www.gnome.org/projects/libgsf; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ lovek323 ]; + platforms = stdenv.lib.platforms.unix; longDescription = '' Libgsf aims to provide an efficient extensible I/O abstraction for dealing with different structured file formats. ''; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 13385dfb65c..15e9b5aa6e9 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo -, libxml2, libgsf, bzip2, libcroco +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf +, bzip2, libcroco , gtk2 ? null, gtk3 ? null , gobjectIntrospection ? null, enableIntrospection ? false }: @@ -9,15 +9,22 @@ stdenv.mkDerivation rec { name = "librsvg-2.36.4"; src = fetchurl { - url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; + url = "mirror://gnome/sources/librsvg/2.36/${name}.tar.xz"; sha256 = "1hp6325gdkzx8yqn2d2r915ak3k6hfshjjh0sc54z3vr0i99688h"; }; + buildInputs = [ libxml2 libgsf bzip2 libcroco pango cairo ] ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; + propagatedBuildInputs = [ glib gdk_pixbuf gtk2 gtk3 ]; + nativeBuildInputs = [ pkgconfig ]; - configureFlags = ["--enable-introspection=auto"]; + configureFlags = [ "--enable-introspection=auto" ] + ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic"; + + NIX_CFLAGS_COMPILE + = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo"; # It wants to add loaders and update the loaders.cache in gdk-pixbuf # Patching the Makefiles to it creates rsvg specific loaders and the |