diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 1f17f830979..9b8beb5b82b 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,35 +1,26 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl +, ghostscript, atk, gtk, glib, fontconfig, freetype +, 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 = with a; [ + buildInputs = [ ghostscript atk gtk glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler popplerData autoconf automake libtool pkgconfig ]; -in -rec { - src = fetchurl { - url = "http://downloads.sourceforge.net/xournal/xournal-${version}.tar.gz"; - sha256 = "1zxqcdhsd7h19c6pz7dwkr8bncn64v07liiqyw504m2v8lylrsif"; - }; - inherit buildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["setEnvVars" "doAutotools" "doConfigure" "doMakeInstall"]; - - setEnvVars = a.noDepEntry ('' - export NIX_LDFLAGS="-lX11" - ''); - - name = "xournal-" + version; + NIX_LDFLAGS="-lX11 -lz"; meta = { description = "note-taking application (supposes stylus)"; - maintainers = [ - ]; + maintainers = [ stdenv.lib.maintainers.guibert ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76ad8347561..5205f80334e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8883,7 +8883,8 @@ let 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 poppler popplerData autoconf automake libtool pkgconfig;