dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #4276 from k0ral/xournal

Browse Source 
xournal: 0.4.5 -> 0.4.8
This commit is contained in:
David Guibert 2014-09-26 09:45:31 +02:00
commit 691c8393ea
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/graphics/xournal/default.nix
View File

@ -4,11 +4,11 @@
, pango, libX11, xproto, zlib, poppler, poppler_data , pango, libX11, xproto, zlib, poppler, poppler_data
, autoconf, automake, libtool, pkgconfig}: , autoconf, automake, libtool, pkgconfig}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.4.5"; version = "0.4.8";
name = "xournal-" + version; name = "xournal-" + version;
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/xournal/${name}.tar.gz"; url = "mirror://sourceforge/xournal/${name}.tar.gz";
sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7"; sha256 = "0c7gjcqhygiyp0ypaipdaxgkbivg6q45vhsj8v5jsi9nh6iqff13";
}; };
buildInputs = [ buildInputs = [
@ -19,14 +19,6 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoconf automake libtool pkgconfig ]; 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"; NIX_LDFLAGS="-lX11 -lz";
meta = { meta = {