diff options
| author | David Guibert <david.guibert@gmail.com> | 2014-09-26 09:45:31 +0200 |
|---|---|---|
| committer | David Guibert <david.guibert@gmail.com> | 2014-09-26 09:45:31 +0200 |
| commit | 691c8393ea4104de55baf0c7fc425a6abc83357f (patch) | |
| tree | 303b0374e86e8658b872eedbe526255e4ffb000a /pkgs/applications/graphics | |
| parent | 58fc36a1798c1185718fce69a36bacef770dd38e (diff) | |
| parent | d178ce6e1e39e795d6fea3a7341aa14b584d4b00 (diff) | |
| download | nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar.gz nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar.bz2 nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar.lz nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar.xz nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.tar.zst nixlib-691c8393ea4104de55baf0c7fc425a6abc83357f.zip | |
Merge pull request #4276 from k0ral/xournal
xournal: 0.4.5 -> 0.4.8
Diffstat (limited to 'pkgs/applications/graphics')
| -rw-r--r-- | pkgs/applications/graphics/xournal/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
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 = { |