Merge nixpkgs/trunk

svn path=/nixpkgs/branches/libpng15/; revision=29488
2011-09-26 00:17:18 +00:00
parent 03aae985bc 1d9c2ff413
commit a9da9ae89d
10 changed files with 78 additions and 47 deletions
@@ -35,5 +35,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "SDL image library";
+    homepage = http://www.libsdl.org/projects/SDL_image/;
+    platforms = stdenv.lib.platforms.all;
  };
 }