diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2016-08-18 15:22:33 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2016-08-18 16:09:34 +0300 |
| commit | 1bde33074efa11fa2edcf71032d2e634f852f349 (patch) | |
| tree | d014ced07ab07c813767f7a344acd501c2bba7f5 /pkgs/applications/graphics/xournal | |
| parent | 7ce717a56cc2141bd6364938065b7bc33316f372 (diff) | |
| download | nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar.gz nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar.bz2 nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar.lz nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar.xz nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.tar.zst nixlib-1bde33074efa11fa2edcf71032d2e634f852f349.zip | |
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).
Diffstat (limited to 'pkgs/applications/graphics/xournal')
| -rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 9c93b9d7317b..53d0473638a8 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -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/; |