From e155371d1e56c9906e9c31e06403b042b955a88d Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 16 Feb 2022 14:07:54 -0600 Subject: [PATCH] azpainter: 2.1.6 -> 3.0.4 * azpainter: 2.1.6 -> 3.0.4 (#157548) * github -> gitlab * 3.0 "remade as a whole" (translated) * new deps * azpainter: add libiconv input on Darwin and add build-time commands and enable parallel building and update meta.homepage Co-authored-by: Renaud --- .../graphics/azpainter/default.nix | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 74dc55fc5e1..0e61da0041b 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,31 +1,40 @@ -{ lib, stdenv, fetchFromGitHub -, libX11, libXext, libXi +{ lib, stdenv, fetchFromGitLab +, desktop-file-utils, shared-mime-info +, libiconv +, libX11, libXcursor, libXext, libXi , freetype, fontconfig -, libpng, libjpeg +, libjpeg, libpng, libtiff, libwebp , zlib }: stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.6"; + version = "3.0.4"; - src = fetchFromGitHub { - owner = "Symbian9"; + src = fetchFromGitLab { + owner = "azelpg"; repo = pname; rev = "v${version}"; - sha256 = "0i5g67s4ysnvbaxmi7dhan0hfcfk8an14xykkafl47pqfx33npva"; + hash = "sha256-2gTTF1ti9bO24d75mhwyvJISSgMKdmp+oJVmgzEQHdY="; }; - buildInputs = [ - libX11 libXext libXi - freetype fontconfig - libpng libjpeg - zlib + nativeBuildInputs = [ + desktop-file-utils # for update-desktop-database + shared-mime-info # for update-mime-info ]; + buildInputs = [ + libX11 libXcursor libXext libXi + freetype fontconfig + libjpeg libpng libtiff libwebp + zlib + ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; + + enableParallelBuilding = true; + meta = with lib; { description = "Full color painting software for illustration drawing"; - homepage = "https://osdn.net/projects/azpainter"; + homepage = "http://azsky2.html.xdomain.jp/soft/azpainter.html"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; platforms = with platforms; linux ++ darwin;