From 76c2e7d82f592b86c9d2a2bb7ca511d46051b711 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 15 Dec 2011 08:01:03 +0000
Subject: xournal: prepare to poppler upgrade

svn path=/nixpkgs/trunk/; revision=30901
---
 pkgs/applications/graphics/xournal/default.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'pkgs/applications/graphics/xournal')

diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix
index b6d7e4314438..990709c03e50 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 ];
   };
-- 
cgit 1.4.1