diff options
| author | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-21 18:53:20 +0100 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-21 18:53:20 +0100 |
| commit | fe86a03a1c590d7c668eeb4720c438f033d3c448 (patch) | |
| tree | c9c937f4128577d37cb356bdb5ce99d498071560 | |
| parent | 56d9b3c4d838aba930455ded8f2cf5897e471dd3 (diff) | |
| download | nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.gz nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.bz2 nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.lz nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.xz nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.zst nixpkgs-fe86a03a1c590d7c668eeb4720c438f033d3c448.zip | |
libpng: use spdx licensing method
| -rw-r--r-- | lib/licenses.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpng/12.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpng/15.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/libraries/libpng/default.nix | 4 |
4 files changed, 11 insertions, 5 deletions
diff --git a/lib/licenses.nix b/lib/licenses.nix index dadb9b07a08..84710a69eb6 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -182,6 +182,11 @@ rec { fullName = "GNU Lesser General Public License v3.0 or later"; }; + libpng = spdx { + shortName = "Libpng"; + fullName = "libpng License"; + }; + libtiff = { shortName = "libtiff"; fullName = "libtiff license"; @@ -292,4 +297,3 @@ rec { }; } - diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix index ff04c7181df..16fc3bfface 100644 --- a/pkgs/development/libraries/libpng/12.nix +++ b/pkgs/development/libraries/libpng/12.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The official reference implementation for the PNG file format"; 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 ]; }; } diff --git a/pkgs/development/libraries/libpng/15.nix b/pkgs/development/libraries/libpng/15.nix index 74012136b90..85ebe56d866 100644 --- a/pkgs/development/libraries/libpng/15.nix +++ b/pkgs/development/libraries/libpng/15.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "The official reference implementation for the PNG file format"; 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 ]; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 3f8622535db..06fff495f54 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -30,8 +30,8 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "The official reference implementation for the PNG file format" + whenPatched " with animation patch"; 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; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.fuuzetsu ]; }; } |