summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-09-21 18:53:20 +0100
committerMateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>2014-09-21 18:53:20 +0100
commitfe86a03a1c590d7c668eeb4720c438f033d3c448 (patch)
treec9c937f4128577d37cb356bdb5ce99d498071560 /pkgs/development
parent56d9b3c4d838aba930455ded8f2cf5897e471dd3 (diff)
downloadnixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.gz
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.bz2
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.lz
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.xz
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.tar.zst
nixlib-fe86a03a1c590d7c668eeb4720c438f033d3c448.zip
libpng: use spdx licensing method
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/libpng/12.nix3
-rw-r--r--pkgs/development/libraries/libpng/15.nix3
-rw-r--r--pkgs/development/libraries/libpng/default.nix4
3 files changed, 6 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index ff04c7181df5..16fc3bffacee 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 74012136b904..85ebe56d8665 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 3f8622535dbf..06fff495f541 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 ];
   };
 }