From 855e5119a2ede3ed65c750292580b1fc442b529d Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 28 Apr 2021 22:56:05 +0200 Subject: [PATCH] jp2a: 1.0.7 -> 1.1.0 --- pkgs/applications/misc/jp2a/default.nix | 32 +++++++++++++++++++------ 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix index a48716a3dd2b..96d506b556e5 100644 --- a/pkgs/applications/misc/jp2a/default.nix +++ b/pkgs/applications/misc/jp2a/default.nix @@ -1,25 +1,43 @@ -{ lib, stdenv, fetchFromGitHub, libjpeg, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, libjpeg +, libpng +, ncurses +, autoreconfHook +, autoconf-archive +, pkg-config +, bash-completion +}: stdenv.mkDerivation rec { - version = "1.0.7"; + version = "1.1.0"; pname = "jp2a"; src = fetchFromGitHub { - owner = "cslarsen"; + owner = "Talinx"; repo = "jp2a"; rev = "v${version}"; - sha256 = "12a1z9ba2j16y67f41y8ax5sgv1wdjd71pg7circdxkj263n78ql"; + sha256 = "1dz2mrhl45f0vwyfx7qc3665xma78q024c10lfsgn6farrr0c2lb"; }; makeFlags = [ "PREFIX=$(out)" ]; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libjpeg ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + bash-completion + ]; + buildInputs = [ libjpeg libpng ncurses ]; + + installFlags = [ "bashcompdir=\${out}/share/bash-completion/completions" ]; meta = with lib; { homepage = "https://csl.name/jp2a/"; description = "A small utility that converts JPG images to ASCII"; - license = licenses.gpl2; + license = licenses.gpl2Only; + maintainers = [ maintainers.FlorianFranzen ]; platforms = platforms.unix; }; }