diff --git a/pkgs/by-name/pa/paps/package.nix b/pkgs/by-name/pa/paps/package.nix index f99da48d4fb2..20d66b612011 100644 --- a/pkgs/by-name/pa/paps/package.nix +++ b/pkgs/by-name/pa/paps/package.nix @@ -2,42 +2,57 @@ lib, stdenv, fetchFromGitHub, - autoconf, - automake, + fetchpatch, + meson, + ninja, pkg-config, - intltool, + fmt, + glib, pango, + versionCheckHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "paps"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "dov"; repo = "paps"; - rev = "v${version}"; - sha256 = "129wpm2ayxs6qfh2761d4x9c034ivb2bcmmcnl56qs4448qb9495"; + rev = "v${finalAttrs.version}"; + hash = "sha256-bNF/kZl/fGAT+He9kMHYj5ERhJwCJJABjhV3H+bs3D0="; }; + patches = [ + # remove when 0.8.1 is released + (fetchpatch { + url = "https://github.com/dov/paps/commit/e9270aaac5e0b8018a6fad9a562ee48e7b2c3113.patch"; + name = "fix-g_utf8_next_char-cast"; + hash = "sha256-fedkyjd8cGFUuUQCbGii7wfMCmK6vye/1/vHWuJiJI4="; + }) + ]; + nativeBuildInputs = [ - autoconf - automake + meson + ninja pkg-config - intltool ]; - buildInputs = [ pango ]; + buildInputs = [ + fmt + glib + pango + ]; - preConfigure = '' - ./autogen.sh - ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; - meta = with lib; { + meta = { description = "Pango to PostScript converter"; homepage = "https://github.com/dov/paps"; - license = licenses.lgpl2; + license = lib.licenses.lgpl2; maintainers = [ ]; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "paps"; }; -} +})