From 7745357f0ee44df266a61249a4b6c9f3fef95ed0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 14 Apr 2013 20:10:23 +0200
Subject: [PATCH] meta.license should be a (list of) string(s), not an
 attribute set

http://hydra.nixos.org/build/4744513
---
 pkgs/development/interpreters/php/5.3.nix |  2 +-
 pkgs/lib/licenses.nix                     | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 138a0ec0292..6d81ca9eea6 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -43,7 +43,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       libxml2 = {
         configureFlags = [
           "--with-libxml-dir=${libxml2}"
-          "--with-iconv-dir=${libiconv}"
+          #"--with-iconv-dir=${libiconv}"
           ];
         buildInputs = [ libxml2 ];
       };
diff --git a/pkgs/lib/licenses.nix b/pkgs/lib/licenses.nix
index 583cece3222..875f71d5f9f 100644
--- a/pkgs/lib/licenses.nix
+++ b/pkgs/lib/licenses.nix
@@ -183,15 +183,9 @@
     url = http://www.tcl.tk/software/tcltk/license.html;
   };
 
-  unfree = {
-    shortName = "unfree";
-    fullName = "unfree non-redistributable license";
-  };
+  unfree = "unfree";
 
-  unfreeRedistributable = {
-    shortName = "unfree-redistributable";
-    fullName = "unfree redistributable license";
-  };
+  unfreeRedistributable = "unfree-redistributable";
 
   zlib = {
     shortName = "zlib";