xournal: update to 0.4.5

svn path=/nixpkgs/trunk/; revision=22022
This commit is contained in:
David Guibert 2010-05-27 19:44:17 +00:00
parent 8a8a0327ff
commit b62332db76
2 changed files with 17 additions and 25 deletions

View File

@ -1,35 +1,26 @@
a : { stdenv, fetchurl
let , ghostscript, atk, gtk, glib, fontconfig, freetype
fetchurl = a.fetchurl; , libgnomecanvas, libgnomeprint, libgnomeprintui
, pango, libX11, xproto, zlib, poppler, popplerData
, autoconf, automake, libtool, pkgconfig}:
stdenv.mkDerivation rec {
version = "0.4.5";
name = "xournal-" + version;
src = fetchurl {
url = "mirror://sourceforge/xournal/${name}.tar.gz";
sha256 = "1lamfzhby06w2pg56lpv1symdixcwmg6wvi7g6br6la4ak5w5mx7";
};
version = a.lib.attrByPath ["version"] "0.4.2.1" a; buildInputs = [
buildInputs = with a; [
ghostscript atk gtk glib fontconfig freetype ghostscript atk gtk glib fontconfig freetype
libgnomecanvas libgnomeprint libgnomeprintui libgnomecanvas libgnomeprint libgnomeprintui
pango libX11 xproto zlib poppler popplerData pango libX11 xproto zlib poppler popplerData
autoconf automake libtool pkgconfig autoconf automake libtool pkgconfig
]; ];
in
rec {
src = fetchurl {
url = "http://downloads.sourceforge.net/xournal/xournal-${version}.tar.gz";
sha256 = "1zxqcdhsd7h19c6pz7dwkr8bncn64v07liiqyw504m2v8lylrsif";
};
inherit buildInputs; NIX_LDFLAGS="-lX11 -lz";
configureFlags = [];
/* doConfigure should be removed if not needed */
phaseNames = ["setEnvVars" "doAutotools" "doConfigure" "doMakeInstall"];
setEnvVars = a.noDepEntry (''
export NIX_LDFLAGS="-lX11"
'');
name = "xournal-" + version;
meta = { meta = {
description = "note-taking application (supposes stylus)"; description = "note-taking application (supposes stylus)";
maintainers = [ maintainers = [ stdenv.lib.maintainers.guibert ];
];
}; };
} }

View File

@ -8883,7 +8883,8 @@ let
inherit (xlibs) libX11 libXpm libXt libXext; inherit (xlibs) libX11 libXpm libXt libXext;
}; };
xournal = builderDefsPackage (import ../applications/graphics/xournal) { xournal = import ../applications/graphics/xournal {
inherit stdenv fetchurl;
inherit ghostscript fontconfig freetype zlib inherit ghostscript fontconfig freetype zlib
poppler popplerData autoconf automake poppler popplerData autoconf automake
libtool pkgconfig; libtool pkgconfig;