Skip to content

djvulibre: fix build on darwin #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lovek323 wants to merge 1 commit into from
Closed

djvulibre: fix build on darwin #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions pkgs/applications/misc/djvulibre/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, libjpeg, libtiff, librsvg }:
{ stdenv, fetchurl, libjpeg, libtiff, librsvg, libintlOrEmpty }:

stdenv.mkDerivation rec {
name = "djvulibre-3.5.25.3";
Expand All @@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
sha256 = "1q5i5ha4zmj2ahjfhi8cv1rah80vm43m9ads46ji38rgvpb7x3c9";
};

buildInputs = [ libjpeg libtiff librsvg ];
buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty;

NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";

meta = {
description = "A library and viewer for the DJVU file format for scanned images";
Expand Down
5 changes: 4 additions & 1 deletion pkgs/desktops/gnome-3/core/libcroco/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, libxml2, glib}:
{ stdenv, fetchurl, pkgconfig, libxml2, glib }:

stdenv.mkDerivation rec {
name = "libcroco-0.6.6"; # 3.6.2 release
Expand All @@ -7,5 +7,8 @@ stdenv.mkDerivation rec {
url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
sha256 = "1nbb12420v1zacn6jwa1x4ixikkcqw66sg4j5dgs45nhygiarv3j";
};

configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";

buildInputs = [ pkgconfig libxml2 glib ];
}
23 changes: 13 additions & 10 deletions pkgs/development/libraries/libgsf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,38 @@
{ fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
, python, gdk_pixbuf, libiconvOrEmpty
}:
, python, gdk_pixbuf, libiconvOrEmpty, libintlOrEmpty }:

with { inherit (stdenv.lib) optionals; };

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;
};
}
15 changes: 11 additions & 4 deletions pkgs/development/libraries/librsvg/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }:

Expand All @@ -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
Expand Down