poppler_data: embed into poppler, make an option
Previously we relied on an environment variable POPPLER_DATADIR which practically noone used and everyone was expected to set. This is a good candidate for a feature option because noone really _noticed_ that this data is not available. Disabled by default because of this and size of the data (22M).
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
{ stdenv, fetchurl
|
||||
, ghostscript, atk, gtk, glib, fontconfig, freetype
|
||||
, libgnomecanvas, libgnomeprint, libgnomeprintui
|
||||
, pango, libX11, xproto, zlib, poppler, poppler_data
|
||||
, pango, libX11, xproto, zlib, poppler
|
||||
, autoconf, automake, libtool, pkgconfig}:
|
||||
stdenv.mkDerivation rec {
|
||||
version = "0.4.8";
|
||||
@@ -14,12 +14,12 @@ stdenv.mkDerivation rec {
|
||||
buildInputs = [
|
||||
ghostscript atk gtk glib fontconfig freetype
|
||||
libgnomecanvas libgnomeprint libgnomeprintui
|
||||
pango libX11 xproto zlib poppler poppler_data
|
||||
pango libX11 xproto zlib poppler
|
||||
];
|
||||
|
||||
nativeBuildInputs = [ autoconf automake libtool pkgconfig ];
|
||||
|
||||
NIX_LDFLAGS="-lX11 -lz";
|
||||
NIX_LDFLAGS = [ "-lX11" "-lz" ];
|
||||
|
||||
meta = {
|
||||
homepage = http://xournal.sourceforge.net/;
|
||||
|
||||
Reference in New Issue
Block a user