meta.license should be a (list of) string(s), not an attribute set

http://hydra.nixos.org/build/4744513

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 138a0ec02921..6d81ca9eea65 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 583cece32220..875f71d5f9f5 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";