JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
http://hydra.nixos.org/build/4744513
This commit is contained in:
Eelco Dolstra 2013-04-14 20:10:23 +02:00
parent d8a2ae8d01
commit 7745357f0e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/interpreters/php/5.3.nix
View File

@ -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 ];
};

10
pkgs/lib/licenses.nix
View File

@ -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";