public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpng: use spdx licensing method

Browse Source
This commit is contained in:
Mateusz Kowalczyk 2014-09-21 18:53:20 +01:00
parent 56d9b3c4d8
commit fe86a03a1c
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/licenses.nix
View File

@ -182,6 +182,11 @@ rec {
fullName = "GNU Lesser General Public License v3.0 or later"; fullName = "GNU Lesser General Public License v3.0 or later";
}; };
libpng = spdx {
shortName = "Libpng";
fullName = "libpng License";
};
libtiff = { libtiff = {
shortName = "libtiff"; shortName = "libtiff";
fullName = "libtiff license"; fullName = "libtiff license";
@ -292,4 +297,3 @@ rec {
}; };
} }

3
pkgs/development/libraries/libpng/12.nix
View File

@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The official reference implementation for the PNG file format"; description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt license = stdenv.lib.licenses.libpng;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
}; };
} }

3
pkgs/development/libraries/libpng/15.nix
View File

@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "The official reference implementation for the PNG file format"; description = "The official reference implementation for the PNG file format";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt license = stdenv.lib.licenses.libpng;
maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
}; };
} }

4
pkgs/development/libraries/libpng/default.nix
View File

@ -30,8 +30,8 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch";
homepage = http://www.libpng.org/pub/png/libpng.html; homepage = http://www.libpng.org/pub/png/libpng.html;
license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt license = licenses.libpng;
platforms = platforms.all; platforms = platforms.all;
maintainers = [ maintainers.vcunat ]; maintainers = [ maintainers.vcunat maintainers.fuuzetsu ];
}; };
} }