libpng: use spdx licensing method

+11 -5
+5 -1
lib/licenses.nix
··· 182 182 fullName = "GNU Lesser General Public License v3.0 or later"; 183 183 }; 184 184 185 + libpng = spdx { 186 + shortName = "Libpng"; 187 + fullName = "libpng License"; 188 + }; 189 + 185 190 libtiff = { 186 191 shortName = "libtiff"; 187 192 fullName = "libtiff license"; ··· 292 297 }; 293 298 294 299 } 295 -
+2 -1
pkgs/development/libraries/libpng/12.nix
··· 26 26 meta = { 27 27 description = "The official reference implementation for the PNG file format"; 28 28 homepage = http://www.libpng.org/pub/png/libpng.html; 29 - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt 29 + license = stdenv.lib.licenses.libpng; 30 + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; 30 31 }; 31 32 }
+2 -1
pkgs/development/libraries/libpng/15.nix
··· 19 19 meta = { 20 20 description = "The official reference implementation for the PNG file format"; 21 21 homepage = http://www.libpng.org/pub/png/libpng.html; 22 - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt 22 + license = stdenv.lib.licenses.libpng; 23 + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; 23 24 }; 24 25 }
+2 -2
pkgs/development/libraries/libpng/default.nix
··· 30 30 meta = with stdenv.lib; { 31 31 description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; 32 32 homepage = http://www.libpng.org/pub/png/libpng.html; 33 - license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt 33 + license = licenses.libpng; 34 34 platforms = platforms.all; 35 - maintainers = [ maintainers.vcunat ]; 35 + maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; 36 36 }; 37 37 }