From d319a2b798dc7dcfff966809a94fea4af2475a15 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 7 Mar 2022 16:58:40 +0000 Subject: [PATCH] tuxpaint: 0.9.24 -> 0.9.27; clarify license It's not right for everything to be in nativeBuildInputs, but most of the dependencies will never cross-compile anyway, so I'm just going to leave it alone. --- pkgs/games/tuxpaint/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/games/tuxpaint/default.nix b/pkgs/games/tuxpaint/default.nix index 289b4e386be0..2573e8c6de8b 100644 --- a/pkgs/games/tuxpaint/default.nix +++ b/pkgs/games/tuxpaint/default.nix @@ -1,17 +1,21 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, - cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: +{ lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, SDL_ttf, SDL_mixer, libpng +, libimagequant, cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf +, imagemagick +}: stdenv.mkDerivation rec { - version = "0.9.24"; + version = "0.9.27"; pname = "tuxpaint"; src = fetchurl { url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; - sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7"; + sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo="; }; - nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo - librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; + nativeBuildInputs = [ + SDL SDL_gfx SDL_image SDL_ttf SDL_mixer libpng cairo libimagequant librsvg + gettext libpaper fribidi pkg-config gperf imagemagick + ]; hardeningDisable = [ "format" ]; makeFlags = [ "GPERF=${gperf}/bin/gperf" "PREFIX=$$out" @@ -45,7 +49,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Source Drawing Software for Children"; homepage = "http://www.tuxpaint.org/"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ woffs ]; platforms = lib.platforms.linux; };