From d178ce6e1e39e795d6fea3a7341aa14b584d4b00 Mon Sep 17 00:00:00 2001 From: koral Date: Thu, 25 Sep 2014 23:58:53 +0200 Subject: xournal: 0.4.5 -> 0.4.8 --- pkgs/applications/graphics/xournal/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'pkgs/applications/graphics') diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 1f1c26c11520..162a6748c06a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -4,11 +4,11 @@ , pango, libX11, xproto, zlib, poppler, poppler_data , autoconf, automake, libtool, pkgconfig}: stdenv.mkDerivation rec { - version = "0.4.5"; + version = "0.4.8"; name = "xournal-" + version; src = fetchurl { url = "mirror://sourceforge/xournal/${name}.tar.gz"; - sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7"; + sha256 = "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13"; }; buildInputs = [ @@ -19,14 +19,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ 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 = { -- cgit 1.4.1