diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-15 08:01:03 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2011-12-15 08:01:03 +0000 |
commit | 76c2e7d82f592b86c9d2a2bb7ca511d46051b711 (patch) | |
tree | b27a31650569da05bc67ecabd62ee32fd116488f /pkgs/applications | |
parent | 471ebaf6f8501f259c6afb7e99f3d3373e0d564c (diff) | |
download | nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar.gz nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar.bz2 nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar.lz nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar.xz nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.tar.zst nixpkgs-76c2e7d82f592b86c9d2a2bb7ca511d46051b711.zip |
xournal: prepare to poppler upgrade
svn path=/nixpkgs/trunk/; revision=30901
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index b6d7e431443..990709c03e5 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -15,11 +15,22 @@ stdenv.mkDerivation rec { ghostscript atk gtk glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler poppler_data - autoconf automake libtool pkgconfig ]; + buildNativeInputs = [ autoconf automake libtool pkgconfig ]; + + # Build with poppler-0.18.x + patchFlags = "-p0"; + + patches = [ (fetchurl { + url = "https://api.opensuse.org/public/source/X11:Utilities/xournal/xournal-poppler-0.18.patch?rev=eca1c0b24f5bc78111147ab8f4688455"; + sha256 = "1q565kqb4bklncriq4dlhp1prhidv88wmxr9k3laykiia0qjmfyj"; + })]; + NIX_LDFLAGS="-lX11 -lz"; + meta = { + homepage = http://xournal.sourceforge.net/; description = "note-taking application (supposes stylus)"; maintainers = [ stdenv.lib.maintainers.guibert ]; }; |