From fe86a03a1c590d7c668eeb4720c438f033d3c448 Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 21 Sep 2014 18:53:20 +0100
Subject: [PATCH] libpng: use spdx licensing method

---
 lib/licenses.nix                              | 6 +++++-
 pkgs/development/libraries/libpng/12.nix      | 3 ++-
 pkgs/development/libraries/libpng/15.nix      | 3 ++-
 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 dadb9b07a08e..84710a69eb66 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 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 ];
   };
 }