svn merge ^/nixpkgs/trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=32273
2012-02-14 14:33:10 +00:00
parent 02eaa57b56
commit c81f618a34
3 changed files with 8 additions and 2 deletions
@@ -27,7 +27,7 @@ stdenv.mkDerivation ({
    homepage = http://www.info-zip.org;
    description = "An extraction utility for archives compressed in .zip format";
    license = "free"; # http://www.info-zip.org/license.html
-    meta.platforms = stdenv.lib.platforms.all;
+    platforms = stdenv.lib.platforms.all;
  };
 } // (if enableNLS then {
  patches =