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.
This commit is contained in:
Alyssa Ross 2022-03-07 16:58:40 +00:00
parent 864f1413b0
commit d319a2b798

View File

@ -1,17 +1,21 @@
{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, SDL_mixer, libpng, { lib, stdenv, fetchurl, SDL, SDL_gfx, SDL_image, SDL_ttf, SDL_mixer, libpng
cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf, imagemagick }: , libimagequant, cairo, librsvg, gettext, libpaper, fribidi, pkg-config, gperf
, imagemagick
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "0.9.24"; version = "0.9.27";
pname = "tuxpaint"; pname = "tuxpaint";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz"; url = "mirror://sourceforge/tuxpaint/${version}/${pname}-${version}.tar.gz";
sha256 = "06m1lg2pikfkmassfvvrbwqffwgixcmjh1li6akaldgkalpmfql7"; sha256 = "sha256-qyuA6J34gijNDsCmyQtJ1UPLFXqjj7kMvTop8AFAVXo=";
}; };
nativeBuildInputs = [ SDL SDL_image SDL_ttf SDL_mixer libpng cairo nativeBuildInputs = [
librsvg gettext libpaper fribidi pkg-config gperf imagemagick ]; SDL SDL_gfx SDL_image SDL_ttf SDL_mixer libpng cairo libimagequant librsvg
gettext libpaper fribidi pkg-config gperf imagemagick
];
hardeningDisable = [ "format" ]; hardeningDisable = [ "format" ];
makeFlags = [ "GPERF=${gperf}/bin/gperf" makeFlags = [ "GPERF=${gperf}/bin/gperf"
"PREFIX=$$out" "PREFIX=$$out"
@ -45,7 +49,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Open Source Drawing Software for Children"; description = "Open Source Drawing Software for Children";
homepage = "http://www.tuxpaint.org/"; homepage = "http://www.tuxpaint.org/";
license = lib.licenses.gpl3; license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ woffs ]; maintainers = with lib.maintainers; [ woffs ];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
}; };